kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Add https credentials to gerrit checkouts

Browse Source 
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 c2f81cf446
commit 8e1c541acf
2 changed files with 70 additions and 47 deletions
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 * The Gerrit Trigger provides all the URLs and refspecs to
* check out the change. * 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', withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS,
branches: [[name: env.GERRIT_BRANCH ]], usernameVariable: 'gerrit_user')]) {
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 ]
]
]
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" 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 * The Gerrit Trigger provides all the URLs and refspecs to
* check out the change. * 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', withCredentials([usernamePassword(credentialsId: env.JENKINS_GERRIT_CREDS,
branches: [[name: env.GERRIT_BRANCH ]], usernameVariable: 'gerrit_user')]) {
extensions: [
[$class: 'ScmName', name: 'gerrit-public'], checkout scm: [$class: 'GitSCM',
[$class: 'CleanBeforeCheckout'], branches: [[name: env.GERRIT_BRANCH ]],
[$class: 'PreBuildMerge', options: [ extensions: [
mergeRemote: 'gerrit-public', [$class: 'ScmName', name: 'gerrit-public'],
fastForwardMode: 'NO_FF', [$class: 'CleanBeforeCheckout'],
mergeStrategy: 'RECURSIVE', [$class: 'PreBuildMerge', options: [
mergeTarget: env.GERRIT_BRANCH]], mergeRemote: 'gerrit-public',
[$class: 'CloneOption', fastForwardMode: 'NO_FF',
honorRefspec: true, mergeStrategy: 'RECURSIVE',
noTags: true, mergeTarget: env.GERRIT_BRANCH]],
depth: 10, [$class: 'CloneOption',
shallow: true honorRefspec: true,
noTags: true,
depth: 10,
shallow: true
],
[$class: 'PruneStaleBranch'],
[$class: 'BuildChooserSetting',
buildChooser: [$class: 'GerritTriggerBuildChooser']
]
], ],
[$class: 'PruneStaleBranch'], userRemoteConfigs: [
[$class: 'BuildChooserSetting', [
buildChooser: [$class: 'GerritTriggerBuildChooser'] 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" sh "sudo tests/CI/setupJenkinsEnvironment.sh"
} }