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
3b7df62
..
799ef6e
100644
(file)
--- a/
jjb/xci/xci-verify-jobs.yaml
+++ b/
jjb/xci/xci-verify-jobs.yaml
@@
-20,17
+20,17
@@
unstable: false
notbuilt: false
- centos:
unstable: false
notbuilt: false
- centos:
- disabled:
fals
e
+ disabled:
tru
e
successful: true
failed: true
unstable: true
notbuilt: true
- opensuse:
disabled: false
successful: true
failed: true
unstable: true
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
# -------------------------------
@@
-67,10
+67,12
@@
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}-.*'
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
- throttle:
max-per-node: 2
max-total: 10
- throttle:
max-per-node: 2
max-total: 10
@@
-112,8
+114,6
@@
pattern: 'xci/scripts/vm/**'
- compare-type: ANT
pattern: 'docs/**'
pattern: 'xci/scripts/vm/**'
- compare-type: ANT
pattern: 'docs/**'
- - compare-type: ANT
- pattern: 'prototypes/**'
- compare-type: ANT
pattern: 'upstream/**'
- project-compare-type: 'REG_EXP'
- compare-type: ANT
pattern: 'upstream/**'
- project-compare-type: 'REG_EXP'
@@
-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,9
@@
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
kill-phase-on: FAILURE
abort-all-job: true
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
@@
-199,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
@@
-207,11
+217,16
@@
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
+ - NOT_BUILT
+ - SUCCESS
+ - UNSTABLE
+ build-steps:
+ - shell: !include-raw: ./xci-cleanup.sh
+ mark-unstable-if-failed: true
- job-template:
- job-template:
@@
-230,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:
@@
-242,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'
@@
-281,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: