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

CI: Fix merge strategy 

Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e
parent 3e5a6a6c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/CI/gates.jenkinsfile
+ 6
− 1
View file @ fcc0a6fe
......@@ -80,15 +80,20 @@ pipeline {
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
mergeRemote: 'gerrit-public',
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption',
honorRefspec: true,
noTags: true,
depth: 10,
shallow: true
],
[$class: 'PruneStaleBranch'],
[$class: 'BuildChooserSetting',
buildChooser: [$class: 'GerritTriggerBuildChooser']
]
......
tests/CI/unittests.jenkinsfile
+ 6
− 1
View file @ fcc0a6fe
......@@ -81,15 +81,20 @@ pipeline {
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
[$class: 'ScmName', name: 'gerrit-public'],
[$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
mergeRemote: 'gerrit-public',
fastForwardMode: 'NO_FF',
mergeStrategy: 'RECURSIVE',
mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption',
honorRefspec: true,
noTags: true,
depth: 10,
shallow: true
],
[$class: 'PruneStaleBranch'],
[$class: 'BuildChooserSetting',
buildChooser: [$class: 'GerritTriggerBuildChooser']
]
......
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