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

CI: Add https credentials to gerrit checkouts 

If the review to be tested is in a project with restricted access,
we need to use the jenkins user's gerrit https credentials when we
do the checkout or the checkout will fail.

Change-Id: I9dc9994763c5ebfeb9f1cff60fb53f6902b7fd5f
This commit is contained in:
George Joseph 2018-08-16 11:08:21 -06:00
parent 4f95992d36
commit 33a5b8ccaf
2 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tests/CI/gates.jenkinsfile
View File

@ -79,33 +79,44 @@ pipeline {
*
* The Gerrit Trigger provides all the URLs and refspecs to
* check out the change.
*
* We need to retrieve the jenkins2 gerrit https credentials
* in case this review is in a restricted project.
*/
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public',
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption',
honorRefspec: true,
noTags: true,
depth: 10,
shallow: true
],
[$class: 'PruneStaleBranch'],
[$class: 'BuildChooserSetting',
buildChooser: [$class: 'GerritTriggerBuildChooser']
]
],
userRemoteConfigs: [
[name: env.GERRIT_NAME, refspec: env.GERRIT_REFSPEC, url: env.GERRIT_PROJECT_URL ]
]
]
withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS,
usernameVariable: 'gerrit_user')]) {
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public',
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption',
honorRefspec: true,
noTags: true,
depth: 10,
shallow: true
],
[$class: 'PruneStaleBranch'],
[$class: 'BuildChooserSetting',
buildChooser: [$class: 'GerritTriggerBuildChooser']
]
],
userRemoteConfigs: [
[
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}@")
]
]
]
}
sh "sudo tests/CI/setupJenkinsEnvironment.sh"
}

56
tests/CI/unittests.jenkinsfile
View File

@ -80,32 +80,44 @@ pipeline {
*
* The Gerrit Trigger provides all the URLs and refspecs to
* check out the change.
*
* We need to retrieve the jenkins2 gerrit https credentials
* in case this review is in a restricted project.
*/
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public',
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption',
honorRefspec: true,
noTags: true,
depth: 10,
shallow: true
withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS,
usernameVariable: 'gerrit_user')]) {
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public',
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption',
honorRefspec: true,
noTags: true,
depth: 10,
shallow: true
],
[$class: 'PruneStaleBranch'],
[$class: 'BuildChooserSetting',
buildChooser: [$class: 'GerritTriggerBuildChooser']
]
],
[$class: 'PruneStaleBranch'],
[$class: 'BuildChooserSetting',
buildChooser: [$class: 'GerritTriggerBuildChooser']
userRemoteConfigs: [
[
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}@")
]
]
],
userRemoteConfigs: [
[name: env.GERRIT_NAME, refspec: env.GERRIT_REFSPEC, url: env.GERRIT_PROJECT_URL ]
]
]
}
sh "sudo tests/CI/setupJenkinsEnvironment.sh"
}