CI: Another stab at creds

Change-Id: I5b1dc3b354789e676c27a4e1fc42f5c3343cc994

diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 332975c2aab18887eedd30ba1cf3f066548cdae3..4af91538e8b3432495ef4716159e0f7889d2ca4e 100644 (file)
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -69,7 +69,6 @@ pipeline {
                                        stage ("Checkout") {
                                                sh "sudo chown -R jenkins:users ."
                                                env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}")
-                                               sh "printenv | sort"
 
                                                /*
                                                 * Jenkins has already automatically checked out the base branch
@@ -85,7 +84,9 @@ pipeline {
                                                 * in case this review is in a restricted project.
                                                 */
                                                withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS,
-                                                       usernameVariable: 'gerrit_user')]) {
+                                                       usernameVariable: 'GERRIT_USER_NAME')]) {
+
+                                                       sh "printenv | sort"
 
                                                        checkout scm: [$class: 'GitSCM',
                                                                branches: [[name: env.GERRIT_BRANCH ]],
@@ -113,11 +114,12 @@ pipeline {
                                                                        credentialsId: env.JENKINS_GERRIT_CREDS,
                                                                        name: env.GERRIT_NAME,
                                                                        refspec: env.GERRIT_REFSPEC,
-                                                                       url: env.GERRIT_PROJECT_URL.replaceAll("http(s)?://", "http\$1://${gerrit_user}@")
+                                                                       url: env.GERRIT_PROJECT_URL
                                                                        ]
                                                                ]
                                                        ]
                                                }
+//                                             url: env.GERRIT_PROJECT_URL.replaceAll("http(s)?://", "http\$1://${env.GERRIT_USER_NAME}@")
 
                                                sh "sudo tests/CI/setupJenkinsEnvironment.sh"
                                        }