From 9a49f9af2d1162528973fbe705c3268d65299f9f Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Mon, 9 Aug 2021 14:36:17 +0200
Subject: [PATCH] Updated Jenkinsfiles to deploy to correct environment

---
 openshift/dev/Jenkinsfile  | 11 +++++------
 openshift/next/Jenkinsfile | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile
index c994c63..1674ab1 100644
--- a/openshift/dev/Jenkinsfile
+++ b/openshift/dev/Jenkinsfile
@@ -2,7 +2,7 @@ def cicdproject = "${CICD_NAMESPACE}"
 def appname = "${APP_NAME}"
 def utv_project = "${UTV_NAMESPACE}"
 def auto_project = "${AUTO_NAMESPACE}"
-def test_project = "${TEST_NAMESPACE}"
+def sys_project = "${SYS_NAMESPACE}"
 def jenkinsslave = "nodejs15-agent"
 def dist_path = "dist/apps/dafa-web"
 
@@ -133,22 +133,21 @@ pipeline {
       }
     }
 
-    stage('Deploy to "test"') {
+    stage('Deploy "sys"') {
       steps {
-        echo '### Deploying to "test"... ###'
+        echo '### Deploying to "sys"... ###'
         script {
           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("annotate dc ${ appname }  version=${BUILD_TAG} --overwrite=true")
               openshift.selector("dc", "${ appname }").rollout().status();
             }
           }
         }
-        echo '### Deployed to "test"! ###'
+        echo '### Deployed to "sys"! ###'
       }
     }
-
   }
 }
 
diff --git a/openshift/next/Jenkinsfile b/openshift/next/Jenkinsfile
index ef96a26..2de6558 100644
--- a/openshift/next/Jenkinsfile
+++ b/openshift/next/Jenkinsfile
@@ -1,7 +1,7 @@
 def cicdproject = "${CICD_NAMESPACE}"
 def appname = "${APP_NAME}"
 def utv_project = "${UTV_NAMESPACE}"
-def sys_project = "${SYS_NAMESPACE}"
+def test_project = "${TEST_NAMESPACE}"
 def jenkinsslave = "nodejs15-agent"
 def dist_path = "dist/apps/dafa-web"
 
@@ -116,19 +116,19 @@ pipeline {
       }
     }
 
-    stage('Deploy "sys"') {
+    stage('Deploy to "test"') {
       steps {
-        echo '### Deploying to "sys"... ###'
+        echo '### Deploying to "test"... ###'
         script {
           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("annotate dc ${ appname }  version=${BUILD_TAG} --overwrite=true")
               openshift.selector("dc", "${ appname }").rollout().status();
             }
           }
         }
-        echo '### Deployed to "sys"! ###'
+        echo '### Deployed to "test"! ###'
       }
     }