From: George Joseph <gjoseph@digium.com>
Date: Tue, 17 Jul 2018 14:01:46 +0000 (-0600)
Subject: CI: Remove pre-build merge from gates and checks
X-Git-Tag: 16.0.0-rc1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2553255acecc66ec39ff14cb2530c1543e552bf7;p=thirdparty%2Fasterisk.git

CI: Remove pre-build merge from gates and checks

Change-Id: Ibc151f63dcec4db847915c2f3cbe5b467dd59574
---

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index b25b8eb7b5..8e3f6a63c8 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -81,11 +81,8 @@ pipeline {
 							branches: [[name: env.GERRIT_BRANCH ]],
 							extensions: [
 								[$class: 'CleanBeforeCheckout'],
-								[$class: 'PreBuildMerge', options: [
-									mergeRemote: env.GERRIT_NAME,
-									mergeTarget: env.GERRIT_BRANCH ]
-								],
 								[$class: 'CloneOption',
+									honorRefspec: true,
 									noTags: true,
 									depth: 10,
 									shallow: true
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index a601697714..ad95d0bd56 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -82,11 +82,8 @@ pipeline {
 							branches: [[name: env.GERRIT_BRANCH ]],
 							extensions: [
 								[$class: 'CleanBeforeCheckout'],
-								[$class: 'PreBuildMerge', options: [
-									mergeRemote: env.GERRIT_NAME,
-									mergeTarget: env.GERRIT_BRANCH ]
-								],
 								[$class: 'CloneOption',
+									honorRefspec: true,
 									noTags: true,
 									depth: 10,
 									shallow: true