CI: Remove pre-build merge from gates and checks

Change-Id: Ibc151f63dcec4db847915c2f3cbe5b467dd59574
8 years ago · ca37fcd54c
parent 4cecc158f4
commit ca37fcd54c
2 changed files with 2 additions and 8 deletions
--- 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
--- 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