arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Jenkinsfiles to deploy to correct environment

Browse Source
This commit is contained in:
Erik Tiekstra
2021-08-09 14:36:17 +02:00
parent f7207ae1e0
commit 9a49f9af2d
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openshift/dev/Jenkinsfile vendored
View File

@@ -2,7 +2,7 @@ def cicdproject = "${CICD_NAMESPACE}"
def appname = "${APP_NAME}" def appname = "${APP_NAME}"
def utv_project = "${UTV_NAMESPACE}" def utv_project = "${UTV_NAMESPACE}"
def auto_project = "${AUTO_NAMESPACE}" def auto_project = "${AUTO_NAMESPACE}"
def test_project = "${TEST_NAMESPACE}" def sys_project = "${SYS_NAMESPACE}"
def jenkinsslave = "nodejs15-agent" def jenkinsslave = "nodejs15-agent"
def dist_path = "dist/apps/dafa-web" def dist_path = "dist/apps/dafa-web"
@@ -133,22 +133,21 @@ pipeline {
} }
} }
stage('Deploy to "test"') { stage('Deploy "sys"') {
steps { steps {
echo '### Deploying to "test"... ###' echo '### Deploying to "sys"... ###'
script { script {
openshift.withCluster() { openshift.withCluster() {
openshift.withProject(test_project) { 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("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.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true")
openshift.selector("dc", "${ appname }").rollout().status(); openshift.selector("dc", "${ appname }").rollout().status();
} }
} }
} }
echo '### Deployed to "test"! ###' echo '### Deployed to "sys"! ###'
} }
} }
} }
} }

10
openshift/next/Jenkinsfile vendored
View File

@@ -1,7 +1,7 @@
def cicdproject = "${CICD_NAMESPACE}" def cicdproject = "${CICD_NAMESPACE}"
def appname = "${APP_NAME}" def appname = "${APP_NAME}"
def utv_project = "${UTV_NAMESPACE}" def utv_project = "${UTV_NAMESPACE}"
def sys_project = "${SYS_NAMESPACE}" def test_project = "${TEST_NAMESPACE}"
def jenkinsslave = "nodejs15-agent" def jenkinsslave = "nodejs15-agent"
def dist_path = "dist/apps/dafa-web" def dist_path = "dist/apps/dafa-web"
@@ -116,19 +116,19 @@ pipeline {
} }
} }
stage('Deploy "sys"') { stage('Deploy to "test"') {
steps { steps {
echo '### Deploying to "sys"... ###' echo '### Deploying to "test"... ###'
script { script {
openshift.withCluster() { openshift.withCluster() {
openshift.withProject(sys_project) { 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("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.raw("annotate dc ${ appname } version=${BUILD_TAG} --overwrite=true")
openshift.selector("dc", "${ appname }").rollout().status(); openshift.selector("dc", "${ appname }").rollout().status();
} }
} }
} }
echo '### Deployed to "sys"! ###' echo '### Deployed to "test"! ###'
} }
} }