summaryrefslogtreecommitdiffstats
path: root/jjb/functest/functest-ci-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest/functest-ci-jobs.yml')
-rw-r--r--jjb/functest/functest-ci-jobs.yml35
1 files changed, 19 insertions, 16 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 1ccaa1b10..24673612b 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -28,6 +28,7 @@
# that have been switched using labels for slaves
#--------------------------------
pod:
+# fuel CI PODs
- baremetal:
slave-label: fuel-baremetal
installer: fuel
@@ -50,6 +51,24 @@
slave-label: fuel-baremetal
installer: fuel
<<: *master
+
+# 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
+ <<: *brahmaputra
+ - virtual:
+ slave-label: joid-virtual
+ installer: joid
+ <<: *brahmaputra
#--------------------------------
# Installers not using labels
# CI PODs
@@ -72,14 +91,6 @@
slave-label: '{pod}'
installer: compass
<<: *brahmaputra
- - intel-pod6:
- slave-label: '{pod}'
- installer: joid
- <<: *master
- - intel-pod5:
- slave-label: '{pod}'
- installer: joid
- <<: *brahmaputra
#--------------------------------
# None-CI PODs
#--------------------------------
@@ -99,10 +110,6 @@
slave-label: '{pod}'
installer: compass
<<: *master
- - virtual:
- slave-label: '{pod}'
- installer: joid
- <<: *master
- huawei-pod2:
slave-label: '{pod}'
installer: compass
@@ -131,10 +138,6 @@
slave-label: '{pod}'
installer: compass
<<: *brahmaputra
- - virtual:
- slave-label: '{pod}'
- installer: joid
- <<: *brahmaputra
#--------------------------------
testsuite: