summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-25 22:28:20 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-26 06:55:44 +0000
commit2e2aaccb68c64732c559594b41d587df49cb6130 (patch)
treeba74119ac712a2705b1a5958dff248e3f5831a73 /jjb/functest
parent2377f84d9142dad19bfabc795d3a5a73e3c67533 (diff)
joid: Switch using labels instead of slaves
This change switches joid jobs to use labels instead of tying jobs to slaves. The changes in detail are: - Joid jobs can roam on any pod that is labelled with joid-baremetal and joid-virtual. - Above means that there is no branch/pod allocation anymore. - New jobs are created in order to get rid of pod names from them and just use baremetal or virtual in names. - Old jobs are removed. - Related test jobs are updated. - POD specific parameters are updated and instead of adding pod specific parameters, they now become parameters for all the pods labelled with same label. It is not a problem at the moment as both Intel PODs (pod5, pod6) have same parameters but a different pod with different parameters will require alignment between pods. Job structure remains same; one parent job calling 3 downstream jobs: deploy, functest, yardstick. Change-Id: I30d270cd05ba3756f6f161d65ee5160eab6b80f4 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/functest')
-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: