kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-20 11:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Add pre-build merge back in as RECURSIVE

Browse Source 
Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8
This commit is contained in:
George Joseph
2018-07-17 09:15:58 -06:00
parent 2ce66f6a66
commit fa333dedd0
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CI/gates.jenkinsfile
View File

@@ -81,6 +81,8 @@ pipeline {
branches: [[name: env.GERRIT_BRANCH ]], branches: [[name: env.GERRIT_BRANCH ]],
extensions: [ extensions: [
[$class: 'CleanBeforeCheckout'], [$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption', [$class: 'CloneOption',
honorRefspec: true, honorRefspec: true,
noTags: true, noTags: true,

2
tests/CI/unittests.jenkinsfile
View File

@@ -82,6 +82,8 @@ pipeline {
branches: [[name: env.GERRIT_BRANCH ]], branches: [[name: env.GERRIT_BRANCH ]],
extensions: [ extensions: [
[$class: 'CleanBeforeCheckout'], [$class: 'CleanBeforeCheckout'],
[$class: 'PreBuildMerge', options: [
mergeStrategy: 'RECURSIVE', mergeTarget: env.GERRIT_BRANCH]],
[$class: 'CloneOption', [$class: 'CloneOption',
honorRefspec: true, honorRefspec: true,
noTags: true, noTags: true,