[Asterisk-code-review] CI: Remove pre-build merge from gates and checks (asterisk[master])

[George Joseph]

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


Change subject: CI: Remove pre-build merge from gates and checks
......................................................................

CI: Remove pre-build merge from gates and checks

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



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/79/9479/1

diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index b25b8eb..8e3f6a6 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -81,11 +81,8 @@
 							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 a601697..ad95d0b 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -82,11 +82,8 @@
 							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

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

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc151f63dcec4db847915c2f3cbe5b467dd59574
Gerrit-Change-Number: 9479
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/7d3209fb/attachment-0001.html>