diff --git a/openshift/prod/Jenkinsfile b/openshift/prod/Jenkinsfile index b3c1688..cde1012 100644 --- a/openshift/prod/Jenkinsfile +++ b/openshift/prod/Jenkinsfile @@ -143,7 +143,7 @@ pipeline { openshift.withProject(cicdproject) { def registry = "nexus.arbetsformedlingen.se:5555" withCredentials([usernamePassword(credentialsId: "${openshift.project()}-nexus-secret", usernameVariable: "REG_USER", passwordVariable: "REG_PWD")]) { - sh "skopeo copy docker://docker-registry.default.svc:5000/${utv_project}/${appname}:latest docker://${registry}/app-af-nexus/${appname}:latest --src-creds jenkins:\$(oc whoami -t) --dest-creds \"$REG_USER:$REG_PWD\" --src-tls-verify=false --dest-tls-verify=false --format v2s2" + sh "skopeo copy docker://docker-registry.default.svc:5000/${utv_project}/${appname}:${BUILD_TAG} docker://${registry}/app-af-nexus/${appname}:${BUILD_TAG} --src-creds jenkins:\$(oc whoami -t) --dest-creds \"$REG_USER:$REG_PWD\" --src-tls-verify=false --dest-tls-verify=false --format v2s2" } } } @@ -166,7 +166,7 @@ pipeline { timeout(time:24, unit:'HOURS') { // changed from 1440 input message: "Go Live with ${ appname } in Production?", ok: "Confirm" def label = "${BUILD_TAG}" - utilities.rollout("${ appname }", "${ appname }", "latest", label, PROJECT_CONTAINING_IMAGES, REGISTRY, USE_CONFIG_MAP, "${ CONFIG_MAP_KEY }", CONFIG_MAP_PATH) + utilities.rollout("${ appname }", "${ appname }", "${BUILD_TAG}", label, PROJECT_CONTAINING_IMAGES, REGISTRY, USE_CONFIG_MAP, "${ CONFIG_MAP_KEY }", CONFIG_MAP_PATH) } } }