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.yml41
1 files changed, 29 insertions, 12 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 2917e5b39..8e3de3d75 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -14,8 +14,8 @@
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- brahmaputra: &brahmaputra
- stream: brahmaputra
+ colorado: &colorado
+ stream: colorado
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
docker-tag: 'stable'
@@ -40,11 +40,11 @@
- baremetal:
slave-label: fuel-baremetal
installer: fuel
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: fuel-virtual
installer: fuel
- <<: *brahmaputra
+ <<: *colorado
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@ -57,11 +57,11 @@
- baremetal:
slave-label: joid-baremetal
installer: joid
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: joid-virtual
installer: joid
- <<: *brahmaputra
+ <<: *colorado
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
@@ -74,11 +74,11 @@
- baremetal:
slave-label: compass-baremetal
installer: compass
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: compass-virtual
installer: compass
- <<: *brahmaputra
+ <<: *colorado
# apex CI PODs
- apex-verify-master:
slave-label: '{pod}'
@@ -88,13 +88,21 @@
slave-label: '{pod}'
installer: apex
<<: *master
+ - apex-verify-colorado:
+ slave-label: '{pod}'
+ installer: apex
+ <<: *colorado
+ - apex-daily-colorado:
+ slave-label: '{pod}'
+ installer: apex
+ <<: *colorado
#--------------------------------
# None-CI PODs
#--------------------------------
- - orange-pod2:
+ - orange-pod1:
slave-label: '{pod}'
installer: joid
- <<: *brahmaputra
+ <<: *master
- orange-pod5:
slave-label: '{pod}'
installer: fuel
@@ -119,10 +127,18 @@
slave-label: '{pod}'
installer: fuel
<<: *master
+ - zte-pod2:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *master
+ - zte-pod3:
+ slave-label: '{pod}'
+ installer: fuel
+ <<: *master
- arm-pod1:
slave-label: '{pod}'
installer: fuel
- <<: *brahmaputra
+ <<: *colorado
#--------------------------------
testsuite:
@@ -160,8 +176,8 @@
parameters:
- project-parameter:
project: '{project}'
- - '{slave-label}-defaults'
- '{installer}-defaults'
+ - '{slave-label}-defaults'
- 'functest-{testsuite}-parameter'
- string:
name: DEPLOY_SCENARIO
@@ -222,6 +238,7 @@
- 'rally_full'
- 'vims'
- 'multisite'
+ - 'parser'
- parameter:
name: functest-parameter
parameters: