Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix up the jenkins example #1155

Merged
merged 1 commit into from
Feb 28, 2015
Merged

Conversation

bparees
Copy link
Contributor

@bparees bparees commented Feb 26, 2015

No description provided.

@bparees
Copy link
Contributor Author

bparees commented Feb 26, 2015

This doesn't yet work because of this issue:
#1154

which causes the prod version to never get deployed (the push of the prod tag is ignored).

Otherwise I think this is good to go...note that i had to update the build logic to actually use tags on output.. @smarterclayton this is what i emailed you about. please take a look at the change to the build controller. If we don't do this, builds using To are always going to be pushed to latest, near as i can tell, despite the comments in BuildOutput.To which imply there is some preferred tag (unless "latest" is that preferred tag)

@bparees
Copy link
Contributor Author

bparees commented Feb 26, 2015

@deads2k @liggitt this will (once the aforementioned issue is closed) get the jenkins sample working again for the current state of the code. if there's more that's going to be needed for roles, please let me know what needs to be done and when. (or just include the work w/ your other changes :) )

@bparees
Copy link
Contributor Author

bparees commented Feb 26, 2015

[test]

@bparees bparees force-pushed the fix_jenkins branch 5 times, most recently from 12cd7a3 to 3a6c4b9 Compare February 27, 2015 01:43
@bparees
Copy link
Contributor Author

bparees commented Feb 27, 2015

@csrwng this also fixes the issue of populating the output image spec as well as using the output tag field (which was previously being ignored). please review.

@csrwng
Copy link
Contributor

csrwng commented Feb 27, 2015

@bparees - I was thinking about this a little more and I thought that it would be more correct to change BuildStatus to a struct with a field contains the actual output image reference used instead of us modifying the spec. Basically bring the build resource more inline with what's upstream (https://github.com/GoogleCloudPlatform/kubernetes/blob/master/pkg/api/types.go#L590-L600). Though I'm not sure this PR is the right vehicle for that ;-)

@bparees
Copy link
Contributor Author

bparees commented Feb 27, 2015

no it's defnitely not. :)

how do you feel about this solution for now?

@csrwng
Copy link
Contributor

csrwng commented Feb 27, 2015

LGTM

@bparees bparees force-pushed the fix_jenkins branch 2 times, most recently from 08268c3 to dd28eaa Compare February 27, 2015 19:59
@bparees
Copy link
Contributor Author

bparees commented Feb 27, 2015

Added test cases for the new label copying, Tag using, and imagereference updating functionality.

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_openshift3/1208/)

@bparees
Copy link
Contributor Author

bparees commented Feb 28, 2015

[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1077/) (Image: devenv-fedora_934)

@openshift-bot
Copy link
Contributor

Evaluated for origin up to f6b0766

openshift-bot pushed a commit that referenced this pull request Feb 28, 2015
@openshift-bot openshift-bot merged commit f798786 into openshift:master Feb 28, 2015
@bparees bparees deleted the fix_jenkins branch February 28, 2015 05:52
jboyd01 pushed a commit to jboyd01/origin that referenced this pull request Sep 20, 2017
…service-catalog/' changes from ae6b643caf..50e234de83

50e234de83 origin build: add origin tooling
092d7f8 Fix typos and resource names in walkthrough e2e logs (openshift#1237)
d25bd11 Archive the old agenda doc, link to new one (openshift#1243)
6192d14 fix lint errors (openshift#1242)
d103dad Fix lint errors and regenerate openapi (openshift#1238)
e9328d3 Broker Relist (openshift#1183)
b0f3222 Correct the reasons and messages set on the ready condition during async polling (openshift#1235)
d2bb82f Re-enable the href checker (openshift#1232)
2c29654 Use feature gates in controller-manager (openshift#1231)
699eab9 switch build to go1.9 (openshift#1155)
7529ed8 broker resource secret authorization checking (openshift#1186)
50d9bdf v0.0.20 chart updates (openshift#1228)
REVERT: ae6b643caf Use oc adm instead of oadm which might not exist in various installations.
REVERT: 66a4eb2a2c Update instructions... will remove once documented elsewhere
REVERT: 1b704d1530 replace build context setup with init containers
REVERT: ee4df18c7f hack/lib: dedup os::util::host_platform and os::build::host_platform
REVERT: 1cd6dfa998 origin: Switch out owners to Red Hatters
REVERT: 664f4d318f Add instructions for syncing repos
REVERT: 2f2cdd546b origin-build: delete files with colon in them
REVERT: cdf8b12848 origin-build: don't build user-broker
REVERT: ebfede9056 origin build: add _output to .gitignore
REVERT: 55412c7e3d origin build: make build-go and build-cross work
REVERT: 68c74ff4ae origin build: modify hard coded path
REVERT: 3d41a217f6 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: 50e234de836b5e7c9e3d7d763847b99a0f0ea500
jboyd01 pushed a commit to jboyd01/origin that referenced this pull request Sep 21, 2017
…service-catalog/' changes from ae6b643caf..06b897d198

06b897d198 origin build: add origin tooling
092d7f8 Fix typos and resource names in walkthrough e2e logs (openshift#1237)
d25bd11 Archive the old agenda doc, link to new one (openshift#1243)
6192d14 fix lint errors (openshift#1242)
d103dad Fix lint errors and regenerate openapi (openshift#1238)
e9328d3 Broker Relist (openshift#1183)
b0f3222 Correct the reasons and messages set on the ready condition during async polling (openshift#1235)
d2bb82f Re-enable the href checker (openshift#1232)
2c29654 Use feature gates in controller-manager (openshift#1231)
699eab9 switch build to go1.9 (openshift#1155)
7529ed8 broker resource secret authorization checking (openshift#1186)
50d9bdf v0.0.20 chart updates (openshift#1228)
REVERT: ae6b643caf Use oc adm instead of oadm which might not exist in various installations.
REVERT: 66a4eb2a2c Update instructions... will remove once documented elsewhere
REVERT: 1b704d1530 replace build context setup with init containers
REVERT: ee4df18c7f hack/lib: dedup os::util::host_platform and os::build::host_platform
REVERT: 1cd6dfa998 origin: Switch out owners to Red Hatters
REVERT: 664f4d318f Add instructions for syncing repos
REVERT: 2f2cdd546b origin-build: delete files with colon in them
REVERT: cdf8b12848 origin-build: don't build user-broker
REVERT: ebfede9056 origin build: add _output to .gitignore
REVERT: 55412c7e3d origin build: make build-go and build-cross work
REVERT: 68c74ff4ae origin build: modify hard coded path
REVERT: 3d41a217f6 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: 06b897d1988a5a3c035c5a971c15b97cbc732918
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Feb 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants