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

Changed namespace variables

Browse Source
This commit is contained in:
Erik Tiekstra
2021-05-04 10:08:06 +02:00
parent b1a4ecf92b
commit 55c4e7cfc2
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
openshift/dev/Jenkinsfile vendored
View File

@@ -1,9 +1,9 @@
def cicdproject = "${CICD_NAMESPACE}" def cicdproject = "${CICD_NAMESPACE}"
def appname = "${APP_NAME}" def appname = "${APP_NAME}"
def devproject = "${DEV_NAMESPACE}" def utv_project = "${UTV_NAMESPACE}"
def i1project = "${I1_NAMESPACE}" def test_project = "${TEST_NAMESPACE}"
def u1project = "${U1_NAMESPACE}" def auto_project = "${AUTO_NAMESPACE}"
def t1project = "${T1_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"
@@ -111,7 +111,7 @@ pipeline {
echo '### Creating image... ###' echo '### Creating image... ###'
script { script {
openshift.withCluster() { openshift.withCluster() {
openshift.withProject(devproject) { openshift.withProject(utv_project) {
openshift.selector("bc", "${ appname }").startBuild("--from-dir=${dist_path}", "--wait=true") openshift.selector("bc", "${ appname }").startBuild("--from-dir=${dist_path}", "--wait=true")
openshift.tag("${ appname }:latest", "${ appname }:${BUILD_TAG}") openshift.tag("${ appname }:latest", "${ appname }:${BUILD_TAG}")
} }
@@ -126,8 +126,8 @@ pipeline {
echo '### Deploying to "auto"... ###' echo '### Deploying to "auto"... ###'
script { script {
openshift.withCluster() { openshift.withCluster() {
openshift.withProject(u1project) { openshift.withProject(auto_project) {
openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${devproject}/${ 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();
} }
@@ -142,8 +142,8 @@ pipeline {
echo '### Deploying to "test"... ###' echo '### Deploying to "test"... ###'
script { script {
openshift.withCluster() { openshift.withCluster() {
openshift.withProject(i1project) { openshift.withProject(test_project) {
openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${devproject}/${ 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();
} }
@@ -158,8 +158,8 @@ pipeline {
echo '### Deploying to "sys"... ###' echo '### Deploying to "sys"... ###'
script { script {
openshift.withCluster() { openshift.withCluster() {
openshift.withProject(t1project) { openshift.withProject(sys_project) {
openshift.raw("set image dc/${ appname } ${ appname }=docker-registry.default.svc:5000/${devproject}/${ 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();
} }