diff --git a/openshift/prod/Jenkinsfile b/openshift/prod/Jenkinsfile index e988803..1c7d055 100644 --- a/openshift/prod/Jenkinsfile +++ b/openshift/prod/Jenkinsfile @@ -175,10 +175,6 @@ pipeline { script { openshift.withCluster() { utilities.defineAuth() - // def api = "https://ocpcluster-a.arbetsformedlingen.se:443" - // env.API = sh(script:"set +x; echo ${api}", returnStdout: true).replaceAll(/https?/, 'insecure') - // def encodedToken = openshift.selector('secret/imagepromote-token').object().data.tokenbase64 - // env.TOKEN = sh(script:"set +x; echo ${encodedToken} | base64 --decode", returnStdout: true) } openshift.withCluster( env.API, env.TOKEN ) { @@ -186,15 +182,10 @@ pipeline { // Wait for approval timeout(time:91440, unit:'MINUTES') { // changed from 1440 input message: "Go Live with ${ appname } in Production?", ok: "Confirm" - def label = "${ env.BUILD_TAG }" + def label = "${BUILD_TAG}" utilities.rollout("${ appname }", "${ appname }", "latest", label, PROJECT_CONTAINING_IMAGES, REGISTRY, USE_CONFIG_MAP, "${ CONFIG_MAP_KEY }", CONFIG_MAP_PATH) } } - // openshift.raw("tag nexus.arbetsformedlingen.se:5555/app-af-nexus/${ appname }:${BUILD_TAG} ${appname}:${BUILD_TAG} --insecure") - // openshift.raw("tag ${ appname }:latest ${ appname }:${BUILD_TAG}") - // openshift.raw("set image dc/${ appname } ${ appname }=nexus.arbetsformedlingen.se:5555/app-af-nexus/${ appname }:${BUILD_TAG} --record=true --source=docker") - // openshift.selector("dc", "${ appname }").rollout().status(); - // echo '### Deployed to prod! ###' } } }