commit 4661cd9ff311f805c6934e828ba6022fcefc0071
author Martin Polreich <polreichmartin@gmail.com> Tue Aug 29 19:05:10 2017 +0200
committer Martin Polreich <polreichmartin@gmail.com> Tue Aug 29 19:05:10 2017 +0200
tree ce7d135dd81e05cf962e0b28e6892abdc0d08763
parent da5e4edfeb2491860692cb438fcefabb9861c5ff

Fix passing gerrit reference params

Change-Id: I38d551812744213c30c3d09362a09a705d6d384f

test-salt-formulas-pipeline.groovy

diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index f5d0c48..a475e3a 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -57,6 +57,8 @@
             common.successMsg("Change ${GERRIT_CHANGE_NUMBER} is already merged, no need to test them")
           }
         }
+        defaultGitUrl = "${GERRIT_SCHEME}://${GERRIT_NAME}@${GERRIT_HOST}:${GERRIT_PORT}/${GERRIT_PROJECT}"
+        defaultGitRef = GERRIT_REFSPEC
       } else if (defaultGitRef && defaultGitUrl) {
         checkouted = gerrit.gerritPatchsetCheckout(defaultGitUrl, defaultGitRef, "HEAD", CREDENTIALS_ID)
       } else {
@@ -104,8 +106,8 @@
                 build job: "test-salt-formulas-env", parameters: [
                   [$class: 'StringParameterValue', name: 'CREDENTIALS_ID', value: CREDENTIALS_ID],
                   [$class: 'StringParameterValue', name: 'KITCHEN_ENV', value: testEnv],
-                  [$class: 'StringParameterValue', name: 'DEFAULT_GIT_REF', value: DEFAULT_GIT_REF],
-                  [$class: 'StringParameterValue', name: 'DEFAULT_GIT_URL', value: DEFAULT_GIT_URL],
+                  [$class: 'StringParameterValue', name: 'DEFAULT_GIT_REF', value: defaultGitRef],
+                  [$class: 'StringParameterValue', name: 'DEFAULT_GIT_URL', value: defaultGitUrl],
                   [$class: 'StringParameterValue', name: 'SALT_OPTS', value: SALT_OPTS],
                   [$class: 'StringParameterValue', name: 'SALT_VERSION', value: SALT_VERSION]
                 ]