Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add option --deploy-scenario <deploy_scenario_name> to support DPDK"
[releng.git]
/
jjb
/
xci
/
xci-merge-jobs.yaml
diff --git
a/jjb/xci/xci-merge-jobs.yaml
b/jjb/xci/xci-merge-jobs.yaml
index
2d112c7
..
0cf1ab9
100644
(file)
--- a/
jjb/xci/xci-merge-jobs.yaml
+++ b/
jjb/xci/xci-merge-jobs.yaml
@@
-223,6
+223,8
@@
blocking-jobs:
- 'xci-verify-{distro}-.*'
- 'xci-merge-{distro}-.*'
blocking-jobs:
- 'xci-verify-{distro}-.*'
- 'xci-merge-{distro}-.*'
+ - 'xci-os.*'
+ - 'xci-k8.*'
- 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
- 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
@@
-316,11
+318,17
@@
publishers:
- postbuildscript:
publishers:
- postbuildscript:
- script-only-if-succeeded: false
- script-only-if-failed: false
builders:
builders:
- - shell:
- !include-raw: ./xci-cleanup.sh
+ - role: BOTH
+ build-on:
+ - ABORTED
+ - FAILURE
+ - NOT_BUILT
+ - SUCCESS
+ - UNSTABLE
+ build-steps:
+ - shell: !include-raw: ./xci-cleanup.sh
+ mark-unstable-if-failed: true
- job-template:
name: 'xci-merge-{distro}-{phase}-virtual-{stream}'
- job-template:
name: 'xci-merge-{distro}-{phase}-virtual-{stream}'