From 8b735172d1bfcbe352a52e5c36b733bd9f7615e0 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Wed, 27 Feb 2019 09:37:14 -0700
Subject: [PATCH] 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 5ce084579f897096163b4e0c2ed4e8e1a8558cca)
---
tests/CI/gates.jenkinsfile | 6 +++---
tests/CI/unittests.jenkinsfile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index ede335392b..03b1f7e772 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -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]],
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 2916cb4ee7..0ef826486d 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -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]],
--
GitLab