Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Configure voting for verify jobs
[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
020ec8b
..
799ef6e
100644
(file)
--- a/
jjb/xci/xci-verify-jobs.yaml
+++ b/
jjb/xci/xci-verify-jobs.yaml
@@
-27,10
+27,10
@@
notbuilt: true
- opensuse:
disabled: false
notbuilt: true
- opensuse:
disabled: false
- successful:
fals
e
- failed:
fals
e
- unstable:
fals
e
- notbuilt:
fals
e
+ successful:
tru
e
+ failed:
tru
e
+ unstable:
tru
e
+ notbuilt:
tru
e
# -------------------------------
# type
# -------------------------------
# -------------------------------
# type
# -------------------------------
@@
-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}'
@@
-149,6
+151,9
@@
- string:
name: CI_LOOP
default: 'verify'
- string:
name: CI_LOOP
default: 'verify'
+ - string:
+ name: FUNCTEST_VERSION
+ default: 'hunter'
- string:
name: FUNCTEST_MODE
default: 'tier'
- string:
name: FUNCTEST_MODE
default: 'tier'
@@
-161,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"
@@
-181,6
+187,7
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
CI_LOOP=$CI_LOOP
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
CI_LOOP=$CI_LOOP
+ FUNCTEST_VERSION=$FUNCTEST_VERSION
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
node-parameters: true
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
node-parameters: true
@@
-201,6
+208,7
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
CI_LOOP=$CI_LOOP
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
CI_LOOP=$CI_LOOP
+ FUNCTEST_VERSION=$FUNCTEST_VERSION
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
node-parameters: true
FUNCTEST_MODE=$FUNCTEST_MODE
FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
node-parameters: true
@@
-213,7
+221,6
@@
- role: BOTH
build-on:
- ABORTED
- role: BOTH
build-on:
- ABORTED
- - FAILURE
- NOT_BUILT
- SUCCESS
- UNSTABLE
- NOT_BUILT
- SUCCESS
- UNSTABLE
@@
-238,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:
@@
-250,6
+257,9
@@
- string:
name: CI_LOOP
default: 'verify'
- string:
name: CI_LOOP
default: 'verify'
+ - string:
+ name: FUNCTEST_VERSION
+ default: 'hunter'
- string:
name: FUNCTEST_MODE
default: 'tier'
- string:
name: FUNCTEST_MODE
default: 'tier'
@@
-289,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: