Skip to content
Snippets Groups Projects
Commit fa333ded authored by George Joseph's avatar George Joseph
Browse files

CI: Add pre-build merge back in as RECURSIVE 

Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8
parent 2ce66f6a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/CI/gates.jenkinsfile
+ 2
− 0
View file @ fa333ded
......@@ -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,
......
tests/CI/unittests.jenkinsfile
+ 2
− 0
View file @ fa333ded
......@@ -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,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment