diff --git a/openshift/prod/Jenkinsfile b/openshift/prod/Jenkinsfile index 17b86e2..bb1a797 100644 --- a/openshift/prod/Jenkinsfile +++ b/openshift/prod/Jenkinsfile @@ -184,17 +184,16 @@ pipeline { openshift.withCluster( env.API, env.TOKEN ) { openshift.withProject(prod_project) { // Wait for approval - timeout(time:1440, unit:'MINUTES') { + timeout(time:91440, unit:'MINUTES') { // changed from 1440 input message: "Go Live with ${ appname } in Production?", ok: "Confirm" - // def label = "${ env.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! ###' - } - } + def label = "${ env.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! ###' } } }