From: George Joseph <gjoseph@digium.com>
Date: Tue, 17 Jul 2018 16:09:01 +0000 (-0600)
Subject: CI: Fix merge strategy
X-Git-Tag: 15.6.0-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47eb309257b625535ba298277e6597d5ca1b0eac;p=thirdparty%2Fasterisk.git

CI: Fix merge strategy

Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e
---

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index f4ec711f33..9dc7308bec 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -80,15 +80,20 @@ pipeline {
 						checkout scm: [$class: 'GitSCM',
 							branches: [[name: env.GERRIT_BRANCH ]],
 							extensions: [
+								[$class: 'ScmName', name: 'gerrit-public'],
 								[$class: 'CleanBeforeCheckout'],
 								[$class: 'PreBuildMerge', options: [
-									mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
+									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']
 								]
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index d549dbfdc4..767ff9447c 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -81,15 +81,20 @@ pipeline {
 						checkout scm: [$class: 'GitSCM',
 							branches: [[name: env.GERRIT_BRANCH ]],
 							extensions: [
+								[$class: 'ScmName', name: 'gerrit-public'],
 								[$class: 'CleanBeforeCheckout'],
 								[$class: 'PreBuildMerge', options: [
-									mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
+									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']
 								]