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

Fixed mixup inside Jenkinsfiles for sys and utv

Browse Source
This commit is contained in:
Erik Tiekstra
2021-10-21 08:01:45 +02:00
parent 8805c59a15
commit 6bb36997d2
2 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
openshift/sys/Jenkinsfile vendored
View File

@@ -1,6 +1,9 @@
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 auto_project = "${AUTO_NAMESPACE}"
def sys_project = "${SYS_NAMESPACE}"
def test_project = "${TEST_NAMESPACE}"
def jenkinsslave = "nodejs15-agent" def jenkinsslave = "nodejs15-agent"
def dist_path = "dist/apps/mina-sidor-fa" def dist_path = "dist/apps/mina-sidor-fa"
@@ -116,21 +119,54 @@ pipeline {
} }
} }
stage('Deploy to "utv"') { stage('Deploy to "auto"') {
steps { steps {
echo '### Deploying to "utv"... ###' echo '### Deploying to "auto"... ###'
script { script {
openshift.withCluster() { 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("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 "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"! ###'
// }
// }
} }
} }

45
openshift/utv/Jenkinsfile vendored
View File

@@ -1,9 +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 auto_project = "${AUTO_NAMESPACE}"
def sys_project = "${SYS_NAMESPACE}"
def test_project = "${TEST_NAMESPACE}"
def jenkinsslave = "nodejs15-agent" def jenkinsslave = "nodejs15-agent"
def dist_path = "dist/apps/mina-sidor-fa" def dist_path = "dist/apps/mina-sidor-fa"
@@ -119,54 +117,21 @@ pipeline {
} }
} }
stage('Deploy to "auto"') { stage('Deploy to "utv"') {
steps { steps {
echo '### Deploying to "auto"... ###' echo '### Deploying to "utv"... ###'
script { script {
openshift.withCluster() { 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("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 "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"! ###'
// }
// }
} }
} }