Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tie all verify/merge/build to opnfv-build-ubuntu
[releng.git]
/
jjb
/
functest
/
functest-ci-jobs.yml
diff --git
a/jjb/functest/functest-ci-jobs.yml
b/jjb/functest/functest-ci-jobs.yml
index
5db40a3
..
8bbed4f
100644
(file)
--- a/
jjb/functest/functest-ci-jobs.yml
+++ b/
jjb/functest/functest-ci-jobs.yml
@@
-22,90
+22,114
@@
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# brahmaputra
+# Installers using labels
+# CI PODs
+# This section should only contain the installers
+# that have been switched using labels for slaves
#--------------------------------
pod:
#--------------------------------
pod:
- - lf-pod1:
- installer: apex
- <<: *brahmaputra
- - intel-pod5:
- installer: joid
- <<: *brahmaputra
- - orange-pod2:
- installer: joid
- <<: *brahmaputra
- - huawei-pod1:
- installer: compass
- <<: *brahmaputra
- - ericsson-pod1:
- installer: fuel
- <<: *brahmaputra
- - ericsson-pod2:
- installer: fuel
- <<: *brahmaputra
- - lf-pod2:
+# fuel CI PODs
+ - baremetal:
+ slave-label: fuel-baremetal
installer: fuel
installer: fuel
- <<: *
brahmaputra
+ <<: *
master
- virtual:
- virtual:
+ slave-label: fuel-virtual
+ installer: fuel
+ <<: *master
+ - baremetal:
+ slave-label: fuel-baremetal
installer: fuel
installer: fuel
- <<: *brahmaputra
- - huawei-virtual:
- installer: compass
<<: *brahmaputra
- virtual:
<<: *brahmaputra
- virtual:
- installer: joid
- <<: *brahmaputra
- - arm-pod1:
+ slave-label: fuel-virtual
installer: fuel
<<: *brahmaputra
installer: fuel
<<: *brahmaputra
-#--------------------------------
-# master
-#--------------------------------
+
+# just in case if things go wrong
- lf-pod2:
- lf-pod2:
+ slave-label: fuel-baremetal
installer: fuel
<<: *master
installer: fuel
<<: *master
- - intel-pod6:
+
+# joid CI PODs
+ - baremetal:
+ slave-label: joid-baremetal
+ installer: joid
+ <<: *master
+ - virtual:
+ slave-label: joid-virtual
+ installer: joid
+ <<: *master
+ - baremetal:
+ slave-label: joid-baremetal
installer: joid
installer: joid
+ <<: *brahmaputra
+ - virtual:
+ slave-label: joid-virtual
+ installer: joid
+ <<: *brahmaputra
+# compass CI PODs
+ - baremetal:
+ slave-label: compass-baremetal
+ installer: compass
<<: *master
<<: *master
- - intel-pod8:
+ - virtual:
+ slave-label: compass-virtual
installer: compass
<<: *master
installer: compass
<<: *master
- - intel-pod7:
+ - baremetal:
+ slave-label: compass-baremetal
+ installer: compass
+ <<: *brahmaputra
+ - virtual:
+ slave-label: compass-virtual
+ installer: compass
+ <<: *brahmaputra
+# apex CI PODs
+ - apex-verify-master:
+ slave-label: '{pod}'
installer: apex
<<: *master
installer: apex
<<: *master
- - ericsson-pod1:
- installer: fuel
- <<: *master
- - orange-pod5:
- installer: fuel
+ - apex-daily-master:
+ slave-label: '{pod}'
+ installer: apex
<<: *master
<<: *master
+#--------------------------------
+# None-CI PODs
+#--------------------------------
- orange-pod2:
- orange-pod2:
+ slave-label: '{pod}'
installer: joid
installer: joid
- <<: *master
- - virtual:
+ <<: *brahmaputra
+ - orange-pod5:
+ slave-label: '{pod}'
installer: fuel
<<: *master
installer: fuel
<<: *master
- - huawei-virtual:
- installer: compass
- <<: *master
- - virtual:
+ - orange-pod2:
+ slave-label: '{pod}'
installer: joid
<<: *master
- huawei-pod2:
installer: joid
<<: *master
- huawei-pod2:
- installer: compass
- <<: *master
- - huawei-pod1:
+ slave-label: '{pod}'
installer: compass
<<: *master
- nokia-pod1:
installer: compass
<<: *master
- nokia-pod1:
+ slave-label: '{pod}'
installer: apex
<<: *master
- arm-pod1:
installer: apex
<<: *master
- arm-pod1:
+ slave-label: '{pod}'
installer: fuel
<<: *master
- zte-pod1:
installer: fuel
<<: *master
- zte-pod1:
+ slave-label: '{pod}'
installer: fuel
<<: *master
installer: fuel
<<: *master
+ - arm-pod1:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *brahmaputra
#--------------------------------
testsuite:
#--------------------------------
testsuite:
@@
-138,7
+162,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - '{
pod
}-defaults'
+ - '{
slave-label
}-defaults'
- '{installer}-defaults'
- 'functest-{testsuite}-parameter'
- string:
- '{installer}-defaults'
- 'functest-{testsuite}-parameter'
- string:
@@
-203,7
+227,7
@@
description: "Push the results of all the tests to the resultDB"
- string:
name: CI_DEBUG
description: "Push the results of all the tests to the resultDB"
- string:
name: CI_DEBUG
- default: '
tru
e'
+ default: '
fals
e'
description: "Show debug output information"
########################
# trigger macros
description: "Show debug output information"
########################
# trigger macros
@@
-231,7
+255,6
@@
- 'set-functest-env'
- 'functest-suite'
- 'set-functest-env'
- 'functest-suite'
-
- builder:
name: functest-suite
builders:
- builder:
name: functest-suite
builders: