diff --git a/tools/jenkins/Jenkinsfile-api b/tools/jenkins/Jenkinsfile-api index 4e95161b..633eaf3b 100644 --- a/tools/jenkins/Jenkinsfile-api +++ b/tools/jenkins/Jenkinsfile-api @@ -76,7 +76,7 @@ pipeline{ openshift.withProject(DEV_NAMESPACE) { openshift.apply( openshift.process("-f", "${SOURCE_REPO_URL_RAW}/${BRANCH}/tools/openshift/api.dc.yaml", - "REPO_NAME=${REPO_NAME}", "HOST_ROUTE=${DEV_HOST_ROUTE}") + "IS_NAMESPACE=${TOOLS_NAMESPACE}", "REPO_NAME=${REPO_NAME}", "HOST_ROUTE=${DEV_HOST_ROUTE}") ) openshift.selector("dc", "${REPO_NAME}-dc").rollout().latest() timeout (time: 10, unit: 'MINUTES') { diff --git a/tools/openshift/api.dc.yaml b/tools/openshift/api.dc.yaml index 24293f76..10ab59a2 100644 --- a/tools/openshift/api.dc.yaml +++ b/tools/openshift/api.dc.yaml @@ -31,7 +31,7 @@ objects: deploymentConfig: "${REPO_NAME}-dc" spec: containers: - - image: image-registry.openshift-image-registry.svc:5000/77c02f-tools/${REPO_NAME}:${TAG_NAME} + - image: image-registry.openshift-image-registry.svc:5000/${IS_NAMESPACE}/${REPO_NAME}:${TAG_NAME} imagePullPolicy: Always volumeMounts: - name: log-storage @@ -149,6 +149,9 @@ parameters: - name: REPO_NAME description: Application repository name required: true + - name: IS_NAMESPACE + description: The namespace where the imagestream lives + required: true - name: TAG_NAME description: Imagestream tag name required: false