CI: Another stab at creds

Change-Id: I5b1dc3b354789e676c27a4e1fc42f5c3343cc994
This commit is contained in:
George Joseph
2018-08-16 12:11:11 -06:00
parent 45d096fe8d
commit b1e294c670

View File

@@ -69,7 +69,6 @@ pipeline {
stage ("Checkout") { stage ("Checkout") {
sh "sudo chown -R jenkins:users ." sh "sudo chown -R jenkins:users ."
env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}") 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 * Jenkins has already automatically checked out the base branch
@@ -85,7 +84,9 @@ pipeline {
* in case this review is in a restricted project. * in case this review is in a restricted project.
*/ */
withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS, withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS,
usernameVariable: 'gerrit_user')]) { usernameVariable: 'GERRIT_USER_NAME')]) {
sh "printenv | sort"
checkout scm: [$class: 'GitSCM', checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]], branches: [[name: env.GERRIT_BRANCH ]],
@@ -113,11 +114,12 @@ pipeline {
credentialsId: env.JENKINS_GERRIT_CREDS, credentialsId: env.JENKINS_GERRIT_CREDS,
name: env.GERRIT_NAME, name: env.GERRIT_NAME,
refspec: env.GERRIT_REFSPEC, 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" sh "sudo tests/CI/setupJenkinsEnvironment.sh"
} }