kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Fix merge strategy

Browse Source 
Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e
This commit is contained in:
George Joseph
2018-07-17 10:09:01 -06:00
parent 3e5a6a6cfc
commit fcc0a6fe8a
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/CI/gates.jenkinsfile
View File

@@ -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']
]

7
tests/CI/unittests.jenkinsfile
View File

@@ -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']
]