X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=0f0cabab3d632e5599207e38686aff5b0f25d5a4;hb=ab40963821dfbcc5d6c1ee2190f25b1bd117d711;hp=28ea6438f9f1af4b85020d898c113969de609779;hpb=9bb881f00effd5f3291b6f1d64332d84bcd12aa1;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 28ea6438f..0f0cabab3 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,16 +144,35 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod1:
+        - zte-pod1:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
+        - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
-            <<: *brahmaputra
+            <<: *master
+        - zte-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - zte-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
+        - arm-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
 #--------------------------------
 
     testsuite:
-        - 'daily'
-        - 'weekly'
-        - 'suite'
+        - 'suite':
+            job-timeout: 60
+        - 'daily':
+            job-timeout: 180
+        - 'weekly':
+            job-timeout: 400
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -151,14 +195,14 @@
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: 400
+            timeout: '{job-timeout}'
             abort: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
         - string:
             name: DEPLOY_SCENARIO
@@ -219,6 +263,7 @@
                 - 'rally_full'
                 - 'vims'
                 - 'multisite'
+                - 'parser'
 - parameter:
     name: functest-parameter
     parameters:
@@ -256,6 +301,7 @@
         - 'set-functest-env'
         - 'functest-daily'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-weekly-builder
@@ -264,6 +310,7 @@
         - 'set-functest-env'
         - 'functest-weekly'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-suite-builder
@@ -307,3 +354,9 @@
     builders:
         - shell:
             !include-raw: ./functest-cleanup.sh
+
+- builder:
+    name: functest-exit
+    builders:
+        - shell:
+            !include-raw: ./functest-exit.sh