From 0ad4ec349402e6124c9c3f3ceed96e55df83e839 Mon Sep 17 00:00:00 2001
From: Ewout Prangsma <ewout@prangsma.net>
Date: Mon, 12 Mar 2018 14:16:13 +0100
Subject: [PATCH] Fixed DEPLOYMENTNAMESPACE for jenkins

---
 Jenkinsfile.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 040c227da..94b7cf6d0 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -37,6 +37,7 @@ pipeline {
                 timestamps {
                     withEnv([
                     "IMAGETAG=${env.GIT_COMMIT}",
+                    "DEPLOYMENTNAMESPACE=${params.TESTNAMESPACE}-${env.GIT_COMMIT}",
                     "DOCKERNAMESPACE=${params.DOCKERNAMESPACE}",
                     ]) {
                         sh "make"
@@ -51,12 +52,12 @@ pipeline {
                     lock("${params.TESTNAMESPACE}-${env.GIT_COMMIT}") {
                         withCredentials([string(credentialsId: 'ENTERPRISEIMAGE', variable: 'DEFAULTENTERPRISEIMAGE')]) { 
                             withEnv([
+                            "DEPLOYMENTNAMESPACE=${params.TESTNAMESPACE}-${env.GIT_COMMIT}",
                             "DOCKERNAMESPACE=${params.DOCKERNAMESPACE}",
                             "ENTERPRISEIMAGE=${params.ENTERPRISEIMAGE}",
                             "IMAGETAG=${env.GIT_COMMIT}",
                             "KUBECONFIG=${params.KUBECONFIG}",
                             "LONG=${params.LONG ? 1 : 0}",
-                            "DEPLOYMENTNAMESPACE=${params.TESTNAMESPACE}-${env.GIT_COMMIT}",
                             ]) {
                                 sh "make run-tests"
                             }