Skip to content

Commit 2df0f93

Browse files
author
Jeff Peeler
committed
Amend catalog jobs to specify user broker image
Depends on openshift/origin#17378.
1 parent 4d33be1 commit 2df0f93

4 files changed

+8
-8
lines changed

‎sjb/config/test_cases/test_branch_origin_service_catalog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extensions:
6060
repository: "origin"
6161
timeout: 1800
6262
script: |-
63-
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
63+
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
6464
- type: "script"
6565
title: "start cluster with Service Catalog"
6666
repository: "origin"
@@ -75,7 +75,7 @@ extensions:
7575
sudo chmod a+rw /var/lib/origin/openshift.local.config/master/admin.kubeconfig
7676
export KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig
7777
./_output/local/bin/linux/amd64/oc login -u system:admin
78-
SERVICECATALOGCONFIG=$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr
78+
SERVICECATALOGCONFIG=$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr -broker-image openshift/user-broker:canary
7979
system_journals:
8080
- origin-master.service
8181
- origin-master-api.service

‎sjb/config/test_cases/test_pull_request_origin_service_catalog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ extensions:
6666
repository: "origin"
6767
timeout: 1800
6868
script: |-
69-
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
69+
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
7070
- type: "script"
7171
title: "start cluster with Service Catalog"
7272
repository: "origin"
@@ -81,7 +81,7 @@ extensions:
8181
sudo chmod a+rw /var/lib/origin/openshift.local.config/master/admin.kubeconfig
8282
export KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig
8383
./_output/local/bin/linux/amd64/oc login -u system:admin
84-
SERVICECATALOGCONFIG=$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr
84+
SERVICECATALOGCONFIG=$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr -broker-image openshift/user-broker:canary
8585
system_journals:
8686
- origin-master.service
8787
- origin-master-api.service

‎sjb/generated/test_branch_origin_service_catalog.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ cat <<SCRIPT >"${script}"
314314
#!/bin/bash
315315
set -o errexit -o nounset -o pipefail -o xtrace
316316
cd "\${GOPATH}/src/github.com/openshift/origin"
317-
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
317+
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
318318
SCRIPT
319319
chmod +x "${script}"
320320
scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}"
@@ -345,7 +345,7 @@ cd "\${GOPATH}/src/github.com/openshift/origin"
345345
sudo chmod a+rw /var/lib/origin/openshift.local.config/master/admin.kubeconfig
346346
export KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig
347347
./_output/local/bin/linux/amd64/oc login -u system:admin
348-
SERVICECATALOGCONFIG=\$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr
348+
SERVICECATALOGCONFIG=\$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr -broker-image openshift/user-broker:canary
349349
SCRIPT
350350
chmod +x "${script}"
351351
scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}"

‎sjb/generated/test_pull_request_origin_service_catalog.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ cat <<SCRIPT >"${script}"
439439
#!/bin/bash
440440
set -o errexit -o nounset -o pipefail -o xtrace
441441
cd "\${GOPATH}/src/github.com/openshift/origin"
442-
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
442+
NO_DOCKER=1 make -C cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog bin/e2e.test
443443
SCRIPT
444444
chmod +x "${script}"
445445
scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}"
@@ -470,7 +470,7 @@ cd "\${GOPATH}/src/github.com/openshift/origin"
470470
sudo chmod a+rw /var/lib/origin/openshift.local.config/master/admin.kubeconfig
471471
export KUBECONFIG=/var/lib/origin/openshift.local.config/master/admin.kubeconfig
472472
./_output/local/bin/linux/amd64/oc login -u system:admin
473-
SERVICECATALOGCONFIG=\$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr
473+
SERVICECATALOGCONFIG=\$KUBECONFIG cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/bin/e2e.test -v 10 -alsologtostderr -broker-image openshift/user-broker:canary
474474
SCRIPT
475475
chmod +x "${script}"
476476
scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}"

0 commit comments

Comments
 (0)