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
b2eb383
..
a70e893
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-287,7
+287,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*$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-430,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
@@
-620,7
+620,7
@@
submodule-disable: false
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
submodule-disable: false
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 #
@@
-737,7
+737,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 #
@@
-852,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 #
@@
-1018,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'
@@
-1128,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}'
@@
-1187,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 #
@@
-1291,6
+1291,7
@@
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
openstack-server-cleanup: true
openstack-stack-cleanup: true
openstack-volume-cleanup: true
@@
-1355,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
@@
-1463,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 #
@@
-1588,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
@@
-1772,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 #