From ab095ca4c63e53982bfb076924496c01badbca5e Mon Sep 17 00:00:00 2001 From: George Joseph Date: Thu, 16 Aug 2018 12:23:05 -0600 Subject: [PATCH] CI: Yet Another stab at creds Change-Id: I768850780d39151c5dd8e2bb1a4b24776727958e --- tests/CI/unittests.jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile index 4af91538e8..8cf9f4ac59 100644 --- a/tests/CI/unittests.jenkinsfile +++ b/tests/CI/unittests.jenkinsfile @@ -83,8 +83,8 @@ pipeline { * We need to retrieve the jenkins2 gerrit https credentials * in case this review is in a restricted project. */ - withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS, - usernameVariable: 'GERRIT_USER_NAME')]) { + withCredentials([usernamePassword(credentialsId: "${JENKINS_GERRIT_CREDS}", + passwordVariable: 'GERRIT_USER_PW', usernameVariable: 'GERRIT_USER_NAME')]) { sh "printenv | sort" @@ -114,12 +114,11 @@ pipeline { credentialsId: env.JENKINS_GERRIT_CREDS, name: env.GERRIT_NAME, refspec: env.GERRIT_REFSPEC, - url: env.GERRIT_PROJECT_URL + url: env.GERRIT_PROJECT_URL.replaceAll("http(s)?://", "http\$1://${GERRIT_USER_NAME}@") ] ] ] } -// url: env.GERRIT_PROJECT_URL.replaceAll("http(s)?://", "http\$1://${env.GERRIT_USER_NAME}@") sh "sudo tests/CI/setupJenkinsEnvironment.sh" }