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 "Create Stable Branch Jobs for doctor"
[releng.git]
/
jjb
/
xci
/
xci-verify-jobs.yaml
diff --git
a/jjb/xci/xci-verify-jobs.yaml
b/jjb/xci/xci-verify-jobs.yaml
index
7d0f905
..
9edf555
100644
(file)
--- a/
jjb/xci/xci-verify-jobs.yaml
+++ b/
jjb/xci/xci-verify-jobs.yaml
@@
-72,7
+72,7
@@
- 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
- 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
- throttle:
max-per-node: 2
max-total: 10
- throttle:
max-per-node: 2
max-total: 10
@@
-140,6
+140,8
@@
- label:
name: SLAVE_LABEL
default: 'xci-virtual'
- label:
name: SLAVE_LABEL
default: 'xci-virtual'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
- string:
name: DISTRO
default: '{distro}'
- string:
name: DISTRO
default: '{distro}'
@@
-164,6
+166,7
@@
description: 'Git URL to use on this Jenkins Slave'
builders:
description: 'Git URL to use on this Jenkins Slave'
builders:
+ - 'xci-verify-clean-vm-macro'
- 'xci-verify-set-scenario-macro'
- inject:
properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
- 'xci-verify-set-scenario-macro'
- inject:
properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
@@
-218,7
+221,6
@@
- role: BOTH
build-on:
- ABORTED
- role: BOTH
build-on:
- ABORTED
- - FAILURE
- NOT_BUILT
- SUCCESS
- UNSTABLE
- NOT_BUILT
- SUCCESS
- UNSTABLE
@@
-243,7
+245,7
@@
- '.*-bifrost-periodic-.*'
- 'osa-verify-.*'
- 'osa-periodic-.*'
- '.*-bifrost-periodic-.*'
- 'osa-verify-.*'
- 'osa-periodic-.*'
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
parameters:
- string:
parameters:
- string:
@@
-297,6
+299,12
@@
# -------------------------------
# builder macros
# -------------------------------
# -------------------------------
# builder macros
# -------------------------------
+- builder:
+ name: 'xci-verify-clean-vm-macro'
+ builders:
+ - shell:
+ !include-raw: ./xci-cleanup.sh
+
- builder:
name: 'xci-verify-set-scenario-macro'
builders:
- builder:
name: 'xci-verify-set-scenario-macro'
builders: