Fixed DEPLOYMENTNAMESPACE for jenkins

arangodb · Mar 12, 2018 · 0ad4ec3 · 0ad4ec3
1 parent f49b1a0
commit 0ad4ec3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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"
                             }