From 5e4e384ea48271d8949cb6645fdd196e2898b1a1 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Tue, 17 Jul 2018 09:15:58 -0600 Subject: [PATCH] CI: Add pre-build merge back in as RECURSIVE Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8 --- tests/CI/gates.jenkinsfile | 2 ++ tests/CI/unittests.jenkinsfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile index 8e3f6a63c8..f4ec711f33 100644 --- a/tests/CI/gates.jenkinsfile +++ b/tests/CI/gates.jenkinsfile @@ -81,6 +81,8 @@ pipeline { branches: [[name: env.GERRIT_BRANCH ]], extensions: [ [$class: 'CleanBeforeCheckout'], + [$class: 'PreBuildMerge', options: [ + mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]], [$class: 'CloneOption', honorRefspec: true, noTags: true, diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile index ad95d0bd56..d549dbfdc4 100644 --- a/tests/CI/unittests.jenkinsfile +++ b/tests/CI/unittests.jenkinsfile @@ -82,6 +82,8 @@ pipeline { branches: [[name: env.GERRIT_BRANCH ]], extensions: [ [$class: 'CleanBeforeCheckout'], + [$class: 'PreBuildMerge', options: [ + mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]], [$class: 'CloneOption', honorRefspec: true, noTags: true,