diff --git a/openshift/sys/Jenkinsfile b/openshift/sys/Jenkinsfile index a66dea7..d946fe2 100644 --- a/openshift/sys/Jenkinsfile +++ b/openshift/sys/Jenkinsfile @@ -1,6 +1,9 @@ def cicdproject = "${CICD_NAMESPACE}" def appname = "${APP_NAME}" def utv_project = "${UTV_NAMESPACE}" +def auto_project = "${AUTO_NAMESPACE}" +def sys_project = "${SYS_NAMESPACE}" +def test_project = "${TEST_NAMESPACE}" def jenkinsslave = "nodejs15-agent" def dist_path = "dist/apps/mina-sidor-fa" @@ -116,21 +119,54 @@ pipeline { } } - stage('Deploy to "utv"') { + stage('Deploy to "auto"') { steps { - echo '### Deploying to "utv"... ###' + echo '### Deploying to "auto"... ###' script { openshift.withCluster() { - openshift.withProject(utv_project) { + openshift.withProject(auto_project) { openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${utv_project}/${ appname }:${BUILD_TAG} --record=true --source=docker") openshift.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true") openshift.selector("dc", "${ appname }").rollout().status(); } } } - echo '### Deployed to "utv"! ###' + echo '### Deployed to "auto"! ###' } } + + stage('Deploy "sys"') { + steps { + echo '### Deploying to "sys"... ###' + script { + openshift.withCluster() { + openshift.withProject(sys_project) { + openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${utv_project}/${ appname }:${BUILD_TAG} --record=true --source=docker") + openshift.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true") + openshift.selector("dc", "${ appname }").rollout().status(); + } + } + } + echo '### Deployed to "sys"! ###' + } + } + + // Temporary while data in sys is so bad + // stage('Deploy to "test"') { + // steps { + // echo '### Deploying to "test"... ###' + // script { + // openshift.withCluster() { + // openshift.withProject(test_project) { + // openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${utv_project}/${ appname }:${BUILD_TAG} --record=true --source=docker") + // openshift.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true") + // openshift.selector("dc", "${ appname }").rollout().status(); + // } + // } + // } + // echo '### Deployed to "test"! ###' + // } + // } } } diff --git a/openshift/utv/Jenkinsfile b/openshift/utv/Jenkinsfile index d946fe2..59ef146 100644 --- a/openshift/utv/Jenkinsfile +++ b/openshift/utv/Jenkinsfile @@ -1,9 +1,7 @@ + def cicdproject = "${CICD_NAMESPACE}" def appname = "${APP_NAME}" def utv_project = "${UTV_NAMESPACE}" -def auto_project = "${AUTO_NAMESPACE}" -def sys_project = "${SYS_NAMESPACE}" -def test_project = "${TEST_NAMESPACE}" def jenkinsslave = "nodejs15-agent" def dist_path = "dist/apps/mina-sidor-fa" @@ -119,54 +117,21 @@ pipeline { } } - stage('Deploy to "auto"') { + stage('Deploy to "utv"') { steps { - echo '### Deploying to "auto"... ###' + echo '### Deploying to "utv"... ###' script { openshift.withCluster() { - openshift.withProject(auto_project) { + openshift.withProject(utv_project) { openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${utv_project}/${ appname }:${BUILD_TAG} --record=true --source=docker") openshift.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true") openshift.selector("dc", "${ appname }").rollout().status(); } } } - echo '### Deployed to "auto"! ###' + echo '### Deployed to "utv"! ###' } } - - stage('Deploy "sys"') { - steps { - echo '### Deploying to "sys"... ###' - script { - openshift.withCluster() { - openshift.withProject(sys_project) { - openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${utv_project}/${ appname }:${BUILD_TAG} --record=true --source=docker") - openshift.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true") - openshift.selector("dc", "${ appname }").rollout().status(); - } - } - } - echo '### Deployed to "sys"! ###' - } - } - - // Temporary while data in sys is so bad - // stage('Deploy to "test"') { - // steps { - // echo '### Deploying to "test"... ###' - // script { - // openshift.withCluster() { - // openshift.withProject(test_project) { - // openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${utv_project}/${ appname }:${BUILD_TAG} --record=true --source=docker") - // openshift.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true") - // openshift.selector("dc", "${ appname }").rollout().status(); - // } - // } - // } - // echo '### Deployed to "test"! ###' - // } - // } } }