add 'ool-virtual1' into functest pod list

[releng.git] / jjb / functest / functest-ci-jobs.yml

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 32251b8..4747835 100644 (file)
--- 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,18 +40,11 @@
         - baremetal:
             slave-label: fuel-baremetal
             installer: fuel
-            <<: *brahmaputra
+            <<: *colorado
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
-            <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *master
-
+            <<: *colorado
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -64,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
@@ -81,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}'
@@ -95,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,6 +129,10 @@
             installer: joid
             <<: *master
         - huawei-pod2:
+            slave-label: '{pod}'
+            installer: compass
+            <<: *colorado
+        - huawei-pod5:
             slave-label: '{pod}'
             installer: compass
             <<: *master
@@ -118,23 +140,48 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - arm-pod1:
+        - arm-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
         - zte-pod1:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
+        - zte-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - zte-pod3:
             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
+# PODs for verify jobs triggered by each patch upload
+        - ool-virtual1:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *master
 #--------------------------------
 
     testsuite:
-        - 'daily'
-        - 'suite'
+        - 'suite':
+            job-timeout: 60
+        - 'daily':
+            job-timeout: 180
+        - 'weekly':
+            job-timeout: 400
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -157,14 +204,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
@@ -183,6 +230,8 @@
             branch: '{branch}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'functest-{testsuite}-builder'
 
 ########################
@@ -194,7 +243,14 @@
         - string:
             name: FUNCTEST_SUITE_NAME
             default: 'daily'
-            description: "Suite name to run"
+            description: "Daily suite name to run"
+- parameter:
+    name: functest-weekly-parameter
+    parameters:
+        - string:
+            name: FUNCTEST_SUITE_NAME
+            default: 'weekly'
+            description: "Weekly suite name to run"
 - parameter:
     name: functest-suite-parameter
     parameters:
@@ -202,16 +258,25 @@
             name: FUNCTEST_SUITE_NAME
             choices:
                 - 'healthcheck'
-                - 'tempest'
-                - 'rally'
+                - 'vping_userdata'
+                - 'vping_ssh'
+                - 'tempest_smoke_serial'
+                - 'rally_sanity'
                 - 'odl'
                 - 'onos'
-                - 'ovno'
                 - 'promise'
                 - 'doctor'
+                - 'bgpvpn'
+                - 'security_scan'
+                - 'tempest_full_parallel'
+                - 'rally_full'
                 - 'vims'
-                - 'vping_userdata'
-                - 'vping_ssh'
+                - 'multisite'
+                - 'parser'
+        - string:
+            name: TESTCASE_OPTIONS
+            default: ''
+            description: 'Addtional parameters specific to test case(s)'
 - parameter:
     name: functest-parameter
     parameters:
@@ -249,6 +314,16 @@
         - 'set-functest-env'
         - 'functest-daily'
         - 'functest-store-results'
+        - 'functest-exit'
+
+- builder:
+    name: functest-weekly-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env'
+        - 'functest-weekly'
+        - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-suite-builder
@@ -258,16 +333,22 @@
         - 'functest-suite'
 
 - builder:
-    name: functest-suite
+    name: functest-daily
     builders:
         - shell:
-            !include-raw: ./functest-suite.sh
+            !include-raw: ./functest-loop.sh
 
 - builder:
-    name: functest-daily
+    name: functest-weekly
+    builders:
+        - shell:
+            !include-raw: ./functest-loop.sh
+
+- builder:
+    name: functest-suite
     builders:
         - shell:
-            !include-raw: ./functest-daily.sh
+            !include-raw: ./functest-suite.sh
 
 - builder:
     name: set-functest-env
@@ -286,3 +367,9 @@
     builders:
         - shell:
             !include-raw: ./functest-cleanup.sh
+
+- builder:
+    name: functest-exit
+    builders:
+        - shell:
+            !include-raw: ./functest-exit.sh