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 b25b8eb7b52532ccb31d6cc81c9486eb970d1c23..8e3f6a63c8d59970a185defdcae39d7e75abdd52 100644 (file)
--- 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 a60169771443612912d5772cce67484addd13b50..ad95d0bd56f4920390519eb2051a0a6027fc717d 100644 (file)
--- 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