[Asterisk-code-review] CI: Fix merge strategy (asterisk[15])

[George Joseph]

George Joseph has uploaded this change for review. ( https://gerrit.asterisk.org/9498


Change subject: CI: Fix merge strategy
......................................................................

CI: Fix merge strategy

Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e
---
M tests/CI/gates.jenkinsfile
M tests/CI/unittests.jenkinsfile
2 files changed, 12 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/98/9498/1

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index f4ec711..9dc7308 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -80,15 +80,20 @@
 						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 d549dbf..767ff94 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -81,15 +81,20 @@
 						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']
 								]

-- 
To view, visit https://gerrit.asterisk.org/9498
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e
Gerrit-Change-Number: 9498
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180717/3ee78092/attachment-0001.html>