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 "[docs] Limit git submodule recurse to depth 1"
[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
baff0c9
..
47ae4f8
100644
(file)
--- a/
jjb/xci/xci-verify-jobs.yaml
+++ b/
jjb/xci/xci-verify-jobs.yaml
@@
-67,6
+67,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}-.*'
@@
-147,6
+149,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'
@@
-159,6
+164,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"
@@
-179,6
+185,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
@@
-197,6
+206,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
@@
-209,7
+219,6
@@
- role: BOTH
build-on:
- ABORTED
- role: BOTH
build-on:
- ABORTED
- - FAILURE
- NOT_BUILT
- SUCCESS
- UNSTABLE
- NOT_BUILT
- SUCCESS
- UNSTABLE
@@
-246,6
+255,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'
@@
-285,6
+297,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: