diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile index d121d3a..9ec3055 100644 --- a/openshift/dev/Jenkinsfile +++ b/openshift/dev/Jenkinsfile @@ -1,9 +1,9 @@ def cicdproject = "${CICD_NAMESPACE}" def appname = "${APP_NAME}" -def devproject = "${DEV_NAMESPACE}" -def i1project = "${I1_NAMESPACE}" -def u1project = "${U1_NAMESPACE}" -def t1project = "${T1_NAMESPACE}" +def utv_project = "${UTV_NAMESPACE}" +def test_project = "${TEST_NAMESPACE}" +def auto_project = "${AUTO_NAMESPACE}" +def sys_project = "${SYS_NAMESPACE}" def jenkinsslave = "nodejs15-agent" def dist_path = "dist/apps/dafa-web" @@ -111,7 +111,7 @@ pipeline { echo '### Creating image... ###' script { openshift.withCluster() { - openshift.withProject(devproject) { + openshift.withProject(utv_project) { openshift.selector("bc", "${ appname }").startBuild("--from-dir=${dist_path}", "--wait=true") openshift.tag("${ appname }:latest", "${ appname }:${BUILD_TAG}") } @@ -126,8 +126,8 @@ pipeline { echo '### Deploying to "auto"... ###' script { openshift.withCluster() { - openshift.withProject(u1project) { - openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${devproject}/${ appname }:${BUILD_TAG} --record=true --source=docker") + 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(); } @@ -142,8 +142,8 @@ pipeline { echo '### Deploying to "test"... ###' script { openshift.withCluster() { - openshift.withProject(i1project) { - openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${devproject}/${ appname }:${BUILD_TAG} --record=true --source=docker") + 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(); } @@ -158,8 +158,8 @@ pipeline { echo '### Deploying to "sys"... ###' script { openshift.withCluster() { - openshift.withProject(t1project) { - openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${devproject}/${ appname }:${BUILD_TAG} --record=true --source=docker") + 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(); }