Merge pull request #18250 from bparees/clusterup_jenkins

Automatic merge from submit-queue.

don't install jenkins ephemeral template in cluster up

fixes #18230

Author: openshift-merge-robot

pkg/oc/bootstrap/docker/up.go

@@ -110,7 +110,6 @@ var (
 		"django quickstart":           "examples/quickstarts/django-postgresql-persistent.json",
 		"nodejs quickstart":           "examples/quickstarts/nodejs-mongodb-persistent.json",
 		"rails quickstart":            "examples/quickstarts/rails-postgresql-persistent.json",
-		"jenkins pipeline ephemeral":  "examples/jenkins/jenkins-ephemeral-template.json",
 		"jenkins pipeline persistent": "examples/jenkins/jenkins-persistent-template.json",
 		"sample pipeline":             "examples/jenkins/pipeline/samplepipeline.yaml",
 	}

test/extended/clusterup.sh

@@ -183,11 +183,11 @@ function os::test::extended::clusterup::service_catalog() {
     # this is only to allow for the retrieval of the TSB service IP, not actual use of the TSB endpoints
     os::cmd::expect_success "oc policy add-role-to-user view developer -n openshift-template-service-broker"
     os::cmd::expect_success "oc login -u developer"
-    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-ephemeral -n openshift -o template --template '{{.metadata.uid}}'` ./provision.sh"
+    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-persistent -n openshift -o template --template '{{.metadata.uid}}'` ./provision.sh"
     os::cmd::try_until_text "oc get pods" "jenkins-1-deploy" $(( 2*minute )) 1
-    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-ephemeral -n openshift -o template --template '{{.metadata.uid}}'` ./bind.sh"
-    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-ephemeral -n openshift -o template --template '{{.metadata.uid}}'` ./unbind.sh"
-    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-ephemeral -n openshift -o template --template '{{.metadata.uid}}'` ./deprovision.sh"
+    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-persistent -n openshift -o template --template '{{.metadata.uid}}'` ./bind.sh"
+    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-persistent -n openshift -o template --template '{{.metadata.uid}}'` ./unbind.sh"
+    os::cmd::expect_success "pushd ${OS_ROOT}/pkg/templateservicebroker/servicebroker/test-scripts; serviceUUID=`oc get template jenkins-persistent -n openshift -o template --template '{{.metadata.uid}}'` ./deprovision.sh"
     os::cmd::try_until_text "oc get pods" "Terminating" $(( 2*minute )) 1
 }