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
Handle stack removal with the force option
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
c34f63d
..
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,12
@@
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-max-total: 0
+ throttle-option: 'project'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-140,6
+147,12
@@
- lf-infra-properties:
project: '{project}'
build-days-to-keep: 7
- lf-infra-properties:
project: '{project}'
build-days-to-keep: 7
+ - throttle:
+ categories: '{obj:throttle_categories}'
+ enabled: '{throttle-enabled}'
+ max-per-node: '{throttle-max-per-node}'
+ max-total: '{throttle-max-total}'
+ option: '{throttle-option}'
parameters:
- lf-infra-parameters:
parameters:
- lf-infra-parameters:
@@
-175,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$
@@
-210,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}'
@@
-267,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
@@
-328,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}'
@@
-363,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}'
@@
-403,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:
@@
-411,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
@@
-473,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:
@@
-506,8
+526,9
@@
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
- submodule-recursive:
'{submodule-recursive}'
+ submodule-recursive:
true
submodule-timeout: '{submodule-timeout}'
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}'
@@
-596,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: '
jjb-deploy[:]* (?!\*+$).+$
'
+ comment-contains-value: '
^Patch Set\s+\d+:\s+(jjb-deploy[:]* (?!\*+$).+$)
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-646,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}'
@@
-684,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}'
@@
-708,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 #
@@
-720,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
@@
-741,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}'
@@
-781,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}'
@@
-822,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 #
@@
-865,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}'
@@
-905,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}'
@@
-959,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 #
@@
-971,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}'
@@
-984,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'
@@
-1027,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 #
@@
-1078,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}'
@@
-1092,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}'
@@
-1119,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}'
@@
-1150,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 #
@@
-1179,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}'
@@
-1215,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}'
@@
-1252,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 #
@@
-1315,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
@@
-1350,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}'
@@
-1365,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}'
@@
-1402,6
+1451,8
@@
packer-version: '{packer-version}'
platform: '{platforms}'
template: '{templates}'
packer-version: '{packer-version}'
platform: '{platforms}'
template: '{templates}'
+ - description-setter:
+ description: '.*Creating the image:(.*)'
- job-template:
name: '{project-name}-packer-merge-{platforms}-{templates}'
- job-template:
name: '{project-name}-packer-merge-{platforms}-{templates}'
@@
-1419,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 #
@@
-1432,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:
@@
-1489,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}'
@@
-1542,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
@@
-1589,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}'
@@
-1629,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}'
@@
-1666,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
@@
-1723,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 #
@@
-1737,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:
@@
-1774,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}'