X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=7120790d8c9ee73aefc0c5d5b7a35e726f320cd8;hb=3065cdbb3d3b0c69c484e4d2b4c295d8babe1e2c;hp=3109fcb6e316a510afb0b52f737fff200f652976;hpb=0b6595dfff8c4cd29a874fc6e697b63e0b57c92e;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3109fcb6e..7120790d8 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,38 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
+        - apex-verify-colorado:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *colorado
+        - apex-daily-colorado:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *colorado
+# armband CI PODs
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *master
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *colorado
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
+        - orange-pod1:
             slave-label: '{pod}'
             installer: joid
-            <<: *brahmaputra
+            <<: *master
         - orange-pod5:
             slave-label: '{pod}'
             installer: fuel
@@ -111,7 +136,7 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - arm-pod1:
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -119,6 +144,10 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
+        - zte-pod1:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -127,10 +156,14 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod1:
+        - zte-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *brahmaputra
+            <<: *colorado
+        - arm-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
 #--------------------------------
 
     testsuite:
@@ -168,8 +201,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
         - string:
             name: DEPLOY_SCENARIO
@@ -231,6 +264,10 @@
                 - 'vims'
                 - 'multisite'
                 - 'parser'
+        - string:
+            name: TESTCASE_OPTIONS
+            default: ''
+            description: 'Addtional parameters specific to test case(s)'
 - parameter:
     name: functest-parameter
     parameters:
@@ -268,6 +305,7 @@
         - 'set-functest-env'
         - 'functest-daily'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-weekly-builder
@@ -276,6 +314,7 @@
         - 'set-functest-env'
         - 'functest-weekly'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-suite-builder
@@ -319,3 +358,9 @@
     builders:
         - shell:
             !include-raw: ./functest-cleanup.sh
+
+- builder:
+    name: functest-exit
+    builders:
+        - shell:
+            !include-raw: ./functest-exit.sh