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

CI: Update jenkinsfiles with new Gerrit URLs

Browse Source 
The recent upgrade of Gerrit to 2.16 elimiated referencing a
repository in a way the jenkinsfiles were relying on so
the URL references were changed to a more consistent and supported
format.

Change-Id: I2e8e3f213b9a96bb1b27665eca4a9a24bc49820e
(cherry picked from commit 5ce084579f)
This commit is contained in:
George Joseph
2019-02-27 09:37:14 -07:00
parent f48a9c2520
commit e0fc663295
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/CI/gates.jenkinsfile
View File

@@ -79,7 +79,7 @@ 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.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)
/* /*
* Jenkins has already automatically checked out the base branch * Jenkins has already automatically checked out the base branch
@@ -102,10 +102,10 @@ pipeline {
checkout scm: [$class: 'GitSCM', checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]], branches: [[name: env.GERRIT_BRANCH ]],
extensions: [ extensions: [
[$class: 'ScmName', name: 'gerrit-public'], [$class: 'ScmName', name: env.GERRIT_NAME],
[$class: 'CleanBeforeCheckout'], [$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [ [$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public', mergeRemote: env.GERRIT_NAME,
fastForwardMode: 'NO_FF', fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE', mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]], mergeTarget: env.GERRIT_BRANCH]],

6
tests/CI/unittests.jenkinsfile
View File

@@ -80,7 +80,7 @@ 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.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)
/* /*
* Jenkins has already automatically checked out the base branch * Jenkins has already automatically checked out the base branch
@@ -103,10 +103,10 @@ pipeline {
checkout scm: [$class: 'GitSCM', checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]], branches: [[name: env.GERRIT_BRANCH ]],
extensions: [ extensions: [
[$class: 'ScmName', name: 'gerrit-public'], [$class: 'ScmName', name: env.GERRIT_NAME],
[$class: 'CleanBeforeCheckout'], [$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [ [$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public', mergeRemote: env.GERRIT_NAME,
fastForwardMode: 'NO_FF', fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE', mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]], mergeTarget: env.GERRIT_BRANCH]],