From 694503d378ccefb1763f9e849a8d3e8f9b4b28ae Mon Sep 17 00:00:00 2001 From: George Joseph Date: Tue, 17 Jul 2018 08:01:46 -0600 Subject: [PATCH] CI: Remove pre-build merge from gates and checks Change-Id: Ibc151f63dcec4db847915c2f3cbe5b467dd59574 --- tests/CI/gates.jenkinsfile | 5 +---- tests/CI/unittests.jenkinsfile | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) 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