Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Standardize "release" wording
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
8a49d03
..
a70e893
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-37,8
+37,9
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
packer-cloud-settings: packer-cloud-env
packer-cloud-settings: packer-cloud-env
- packer-version: 1.
2.5
+ packer-version: 1.
4.0
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-113,6
+114,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
throttle_categories: []
throttle-enabled: false
throttle-max-per-node: 1
throttle_categories: []
throttle-enabled: false
throttle-max-per-node: 1
@@
-186,6
+188,7
@@
git-url: '$GIT_URL/$GERRIT_PROJECT'
stream: master
submodule-timeout: 10
git-url: '$GIT_URL/$GERRIT_PROJECT'
stream: master
submodule-timeout: 10
+ submodule-disable: false
gerrit_merge_triggers:
- comment-added-contains-event:
comment-contains-value: (un)?lock branch$
gerrit_merge_triggers:
- comment-added-contains-event:
comment-contains-value: (un)?lock branch$
@@
-221,6
+224,7
@@
branch: '{branch}'
submodule-recursive: false
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: false
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-278,11
+282,12
@@
github-url: 'https://github.com'
jenkins-silos: production sandbox
submodule-timeout: 10
github-url: 'https://github.com'
jenkins-silos: production sandbox
submodule-timeout: 10
+ submodule-disable: false
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value:
remerge$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+remerge\s*$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-339,6
+344,7
@@
branch: '{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-374,6
+380,7
@@
branch: 'refs/heads/{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: 'refs/heads/{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-414,6
+421,7
@@
github-url: 'https://github.com'
openstack-cloud: vex
submodule-timeout: 10
github-url: 'https://github.com'
openstack-cloud: vex
submodule-timeout: 10
+ submodule-disable: false
gerrit_verify_triggers:
- patchset-created-event:
gerrit_verify_triggers:
- patchset-created-event:
@@
-422,7
+430,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-484,11
+492,12
@@
scm:
- lf-infra-gerrit-scm:
git-url: '{git-url}'
scm:
- lf-infra-gerrit-scm:
git-url: '{git-url}'
- refspec: '
refs/heads/{branch}
'
- branch: '
{branch}
'
+ refspec: '
$GERRIT_REFSPEC
'
+ branch: '
$GERRIT_BRANCH
'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
- choosing-strategy: default
+ submodule-disable: '{submodule-disable}'
+ choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
@@
-519,6
+528,7
@@
branch: '$sha1'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-607,9
+617,10
@@
github-url: 'https://github.com'
stream: master
submodule-timeout: 10
github-url: 'https://github.com'
stream: master
submodule-timeout: 10
+ submodule-disable: false
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)
(jjb-deploy[:]* (?!\*+$).+$)'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+
(jjb-deploy[:]* (?!\*+$).+$)'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-657,6
+668,7
@@
branch: '{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-695,6
+707,7
@@
branch: '$sha1'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-719,10
+732,12
@@
# Default parameters #
######################
# Default parameters #
######################
+ jjb-workers: 0
+
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value:
remerge$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+remerge\s*$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-731,6
+746,8
@@
builders:
- lf-infra-pre-build
- lf-infra-jjbini
builders:
- lf-infra-pre-build
- lf-infra-jjbini
+ - inject:
+ properties-content: JJB_WORKERS={jjb-workers}
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- ../shell/jjb-merge-job.sh
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- ../shell/jjb-merge-job.sh
@@
-752,6
+769,7
@@
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-792,6
+810,7
@@
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: 'refs/heads/{branch}'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-833,7
+852,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-876,6
+895,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-916,6
+936,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-970,6
+991,7
@@
git-url: '$GIT_URL/$PROJECT'
submodule-timeout: 10
git-url: '$GIT_URL/$PROJECT'
submodule-timeout: 10
+ submodule-disable: false
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-982,6
+1004,7
@@
branch: 'master'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: 'master'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-995,7
+1018,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
projects:
- project-compare-type: ANT
project-pattern: 'releng/global-jjb'
projects:
- project-compare-type: ANT
project-pattern: 'releng/global-jjb'
@@
-1038,6
+1061,7
@@
spdx-disable: false
stream: master
submodule-timeout: 10
spdx-disable: false
stream: master
submodule-timeout: 10
+ submodule-disable: false
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1089,6
+1113,7
@@
# Submodules are out of the project's control
submodule-recursive: false
submodule-timeout: '{submodule-timeout}'
# Submodules are out of the project's control
submodule-recursive: false
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1103,7
+1128,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value:
recheck$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
projects:
- project-compare-type: ANT
project-pattern: '{project-pattern}'
projects:
- project-compare-type: ANT
project-pattern: '{project-pattern}'
@@
-1130,6
+1155,7
@@
# Submodules are out of the project's control
submodule-recursive: false
submodule-timeout: '{submodule-timeout}'
# Submodules are out of the project's control
submodule-recursive: false
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1161,7
+1187,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1190,6
+1216,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1226,6
+1253,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1263,11
+1291,13
@@
openstack-image-cleanup: true
openstack-image-cleanup-age: 30
openstack-image-protect: true
openstack-image-cleanup: true
openstack-image-cleanup-age: 30
openstack-image-protect: true
+ openstack-port-cleanup: true
openstack-server-cleanup: true
openstack-stack-cleanup: true
openstack-volume-cleanup: true
stream: master
submodule-timeout: 10
openstack-server-cleanup: true
openstack-stack-cleanup: true
openstack-volume-cleanup: true
stream: master
submodule-timeout: 10
+ submodule-disable: false
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1326,6
+1356,12
@@
condition-expression: '{openstack-server-cleanup}'
steps:
- shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-servers.sh
condition-expression: '{openstack-server-cleanup}'
steps:
- shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-servers.sh
+ # Ports
+ - conditional-step:
+ condition-kind: boolean-expression
+ condition-expression: '{openstack-port-cleanup}'
+ steps:
+ - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-ports.sh
# Volumes
- conditional-step:
condition-kind: boolean-expression
# Volumes
- conditional-step:
condition-kind: boolean-expression
@@
-1361,6
+1397,7
@@
branch: '{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: '{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1376,6
+1413,7
@@
branch: 'refs/heads/{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
branch: 'refs/heads/{branch}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1432,7
+1470,7
@@
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value:
remerge$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+remerge\s*$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1445,7
+1483,8
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
- choosing-strategy: gerrit
+ submodule-disable: '{submodule-disable}'
+ choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
@@
-1502,6
+1541,7
@@
branch: '$GERRIT_REFSPEC'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_REFSPEC'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1555,7
+1595,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-1602,6
+1642,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1642,6
+1683,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-1679,6
+1721,7
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ submodule-disable: false
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-1736,7
+1779,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1750,6
+1793,7
@@
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: gerrit
triggers:
choosing-strategy: gerrit
triggers:
@@
-1787,6
+1831,7
@@
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
branch: '$sha1'
submodule-recursive: '{submodule-recursive}'
submodule-timeout: '{submodule-timeout}'
+ submodule-disable: '{submodule-disable}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'