Merge pull request #3129 from AdamBrousseau/fix_artifactory_setup

Only set Artifactory env variables if they are not null
eclipse-openj9 · Oct 3, 2018 · 1fe87fa · 1fe87fa
2 parents b7d953b + ffe0bbb
commit 1fe87fa
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/buildenv/jenkins/common/variables-functions b/buildenv/jenkins/common/variables-functions
@@ -433,12 +433,12 @@ def set_slack_channel() {
 }
 
 def set_artifactory_config() {
-    env.ARTIFACTORY_SERVER = VARIABLES.artifactory_server
-    env.ARTIFACTORY_REPO = VARIABLES.artifactory_repo
-    // Set Creds to env so that the parent pipeline can retireve them.
-    env.ARTIFACTORY_CREDS = VARIABLES.artifactory_creds
-    env.ARTIFACTORY_NUM_ARTIFACTS = VARIABLES.artifactory_num_artifacts
-    if (ARTIFACTORY_SERVER) {
+    if (VARIABLES.artifactory_server) {
+        env.ARTIFACTORY_SERVER = ARTIFACTORY_SERVER
+        env.ARTIFACTORY_REPO = VARIABLES.artifactory_repo
+        // Set Creds to env so that the parent pipeline can retireve them.
+        env.ARTIFACTORY_CREDS = VARIABLES.artifactory_creds
+        env.ARTIFACTORY_NUM_ARTIFACTS = VARIABLES.artifactory_num_artifacts
         echo "Using artifactory server/repo: ${ARTIFACTORY_SERVER} / ${ARTIFACTORY_REPO}"
         echo "Using artifactory credentials: ${ARTIFACTORY_CREDS}"
         echo "Keeping '${ARTIFACTORY_NUM_ARTIFACTS}' artifacts"