sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Fixup for non-13 branches 

Change-Id: I5e1d4a09e58b92b541bc8ed6f9e10e54c4e5101f
This commit is contained in:
George Joseph 2018-08-16 12:51:51 -06:00
parent 4ca959c72c
commit df78227e4a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/CI/unittests.jenkinsfile
View File

@ -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
@ -84,8 +83,10 @@ 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')]) {
withCredentials([usernamePassword(credentialsId: "${JENKINS_GERRIT_CREDS}",
passwordVariable: 'GERRIT_USER_PW', usernameVariable: 'GERRIT_USER_NAME')]) {
sh "printenv | sort"
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
@ -113,7 +114,7 @@ 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.replaceAll("http(s)?://", "http\$1://${GERRIT_USER_NAME}@")
]
]
]