Vendor service-catalog and add to origin.spec #14301
Conversation
origin.spec
Outdated
| @@ -231,6 +238,30 @@ of docker. Exclude those versions of docker. | |||
| OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-cross.sh | |||
| %endif | |||
|
|
|||
| # Build service-catalog | |||
There was a problem hiding this comment.
Should be able to squash this into the above if/elif/else tree:
%build
%if 0%{make_redistributable}
# Create Binaries for all supported arches
%{os_git_vars} hack/build-cross.sh
%{os_git_vars} cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh
%else
# ...
jpeeler
changed the title
jpeeler
changed the title
|
[test] |
|
[test] |
|
[test] |
|
[test] |
2 similar comments
|
[test] |
|
[test] |
|
[test] #13980 |
|
[test] #13980 |
openshift-bot
added
the
needs-rebase
|
@jpeeler Have you updated origin/hack/build-images.sh to include service catalog image so that the SC image is also built as part of origin/openshift build pipeline? |
|
@jpeeler uodate hack/verify-govet.sh as discussed with eparis if you think thats ok. I update mine. |
|
I am assuming you are already going to update this PR for one rpm/one container. |
jpeeler
force-pushed
the
master
branch
2 times, most recently
from
514a7de to
da2f15a
Compare
|
[test] |
|
[test] |
openshift-bot
removed
the
needs-rebase
|
[merge] you fool! merge I say! |
|
continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 14 |
|
Evaluated for origin merge up to 6389af7 |
openshift-bot
added
the
needs-rebase
|
[test] |
|
[merge] after rebase |
openshift-bot
removed
the
needs-rebase
|
[test] |
|
and since you edit'd it we need another [merge] |
|
[test] |
|
[test] because of flaky stuff? |
openshift-bot
added
the
needs-rebase
…service-catalog/' content from commit c91fecb git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: c91fecb25e0231e17cb7b456fe9eb6a8ad9936ad
make golint and gofmt ignore service catalog exclude from test-go.sh
Produces service catalog subpackage
|
[merge] |
|
@jpeeler I am confused why it seems that you removed hellp-openshift image and added s-c image hack/push-release.sh? sorry if I missed something. |
also add image to push-release.sh
openshift-bot
removed
the
needs-rebase
|
[merge] (but with 24 in the queue, it isn't going to matter any time soon) |
origin.spec
Outdated
| # Install service-catalog | ||
| install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/apiserver %{buildroot}%{_bindir}/ | ||
| install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/controller-manager %{buildroot}%{_bindir}/ | ||
| install -p -m 755 cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/_output/local/bin/${PLATFORM}/user-broker %{buildroot}%{_bindir}/ |
There was a problem hiding this comment.
@pmorie - why are we shipping this? we should remove the user-broker
origin.spec
Outdated
| %files service-catalog | ||
| %{_bindir}/apiserver | ||
| %{_bindir}/controller-manager | ||
| %{_bindir}/user-broker |
|
wait the [test] failed because it logged in too quickly? |
|
Evaluated for origin test up to 840f4a8 |
|
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2053/) (Base Commit: cc2ed8f) |
|
lol |
No description provided.