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

CI: Update jenkinsfiles with new Gerrit URLs 

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 cc8aa4eee1
commit 6e8cba39a4
2 changed files with 6 additions and 6 deletions
Show Stats 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") {
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
@ -102,10 +102,10 @@ pipeline {
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'ScmName', name: env.GERRIT_NAME],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public',
mergeRemote: env.GERRIT_NAME,
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],

6
tests/CI/unittests.jenkinsfile
View File

@ -80,7 +80,7 @@ pipeline {
stage ("Checkout") {
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
@ -103,10 +103,10 @@ pipeline {
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'ScmName', name: env.GERRIT_NAME],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeRemote: 'gerrit-public',
mergeRemote: env.GERRIT_NAME,
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],