X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=3109fcb6e316a510afb0b52f737fff200f652976;hb=e54e1e84b574c4a673008bf0c6ce4b7c661c075e;hp=24673612bf51ab82134165c1efa750c2f81c9ef5;hpb=17b9fb9214e4796a20b1dfbda15b0013d4f97312;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 24673612b..3109fcb6e 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -45,13 +45,6 @@
             slave-label: fuel-virtual
             installer: fuel
             <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *master
-
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -69,28 +62,32 @@
             slave-label: joid-virtual
             installer: joid
             <<: *brahmaputra
-#--------------------------------
-#    Installers not using labels
-#            CI PODs
-# This section should only contain the installers
-# that have not been switched using labels for slaves
-#--------------------------------
-        - intel-pod7:
+# compass CI PODs
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            <<: *master
+        - virtual:
+            slave-label: compass-virtual
+            installer: compass
+            <<: *master
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            <<: *brahmaputra
+        - virtual:
+            slave-label: compass-virtual
+            installer: compass
+            <<: *brahmaputra
+# apex CI PODs
+        - apex-verify-master:
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - lf-pod1:
+        - apex-daily-master:
             slave-label: '{pod}'
             installer: apex
-            <<: *brahmaputra
-        - intel-pod8:
-            slave-label: '{pod}'
-            installer: compass
             <<: *master
-        - huawei-pod1:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *brahmaputra
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -106,18 +103,10 @@
             slave-label: '{pod}'
             installer: joid
             <<: *master
-        - huawei-virtual:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *master
         - huawei-pod2:
             slave-label: '{pod}'
             installer: compass
             <<: *master
-        - huawei-pod1:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *master
         - nokia-pod1:
             slave-label: '{pod}'
             installer: apex
@@ -130,19 +119,27 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod1:
+        - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
-            <<: *brahmaputra
-        - huawei-virtual:
+            <<: *master
+        - zte-pod3:
             slave-label: '{pod}'
-            installer: compass
+            installer: fuel
+            <<: *master
+        - arm-pod1:
+            slave-label: '{pod}'
+            installer: fuel
             <<: *brahmaputra
 #--------------------------------
 
     testsuite:
-        - 'daily'
-        - 'suite'
+        - 'suite':
+            job-timeout: 60
+        - 'daily':
+            job-timeout: 180
+        - 'weekly':
+            job-timeout: 400
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -159,12 +156,13 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
 
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: 400
+            timeout: '{job-timeout}'
             abort: true
 
     parameters:
@@ -190,6 +188,8 @@
             branch: '{branch}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'functest-{testsuite}-builder'
 
 ########################
@@ -201,23 +201,36 @@
         - 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:
         - choice:
             name: FUNCTEST_SUITE_NAME
             choices:
-                - 'tempest'
-                - 'rally'
+                - 'healthcheck'
+                - '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'
 - parameter:
     name: functest-parameter
     parameters:
@@ -235,7 +248,7 @@
             description: "Push the results of all the tests to the resultDB"
         - string:
             name: CI_DEBUG
-            default: 'true'
+            default: 'false'
             description: "Show debug output information"
 ########################
 # trigger macros
@@ -256,6 +269,14 @@
         - 'functest-daily'
         - 'functest-store-results'
 
+- builder:
+    name: functest-weekly-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env'
+        - 'functest-weekly'
+        - 'functest-store-results'
+
 - builder:
     name: functest-suite-builder
     builders:
@@ -263,18 +284,23 @@
         - 'set-functest-env'
         - 'functest-suite'
 
+- builder:
+    name: functest-daily
+    builders:
+        - shell:
+            !include-raw: ./functest-loop.sh
 
 - builder:
-    name: functest-suite
+    name: functest-weekly
     builders:
         - shell:
-            !include-raw: ./functest-suite.sh
+            !include-raw: ./functest-loop.sh
 
 - builder:
-    name: functest-daily
+    name: functest-suite
     builders:
         - shell:
-            !include-raw: ./functest-daily.sh
+            !include-raw: ./functest-suite.sh
 
 - builder:
     name: set-functest-env