X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=7478e2a86d5ae4777d0e8fbb4a9fb04952f407cd;hb=f6fb85d278ada5d2a407c49a7f4c5de9c81b8d67;hp=8bbed4f15c79cb61c17a855bf4822b11001cd742;hpb=078f73df2a2db9e9e36c7cfa0bddf53cebc56cc5;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 8bbed4f15..7478e2a86 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
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         docker-tag: 'stable'
@@ -40,18 +40,11 @@
         - baremetal:
             slave-label: fuel-baremetal
             installer: fuel
-            <<: *brahmaputra
+            <<: *danube
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
-            <<: *brahmaputra
-
-# just in case if things go wrong
-        - lf-pod2:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *master
-
+            <<: *danube
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -64,11 +57,11 @@
         - baremetal:
             slave-label: joid-baremetal
             installer: joid
-            <<: *brahmaputra
+            <<: *danube
         - virtual:
             slave-label: joid-virtual
             installer: joid
-            <<: *brahmaputra
+            <<: *danube
 # compass CI PODs
         - baremetal:
             slave-label: compass-baremetal
@@ -81,11 +74,11 @@
         - baremetal:
             slave-label: compass-baremetal
             installer: compass
-            <<: *brahmaputra
+            <<: *danube
         - virtual:
             slave-label: compass-virtual
             installer: compass
-            <<: *brahmaputra
+            <<: *danube
 # apex CI PODs
         - apex-verify-master:
             slave-label: '{pod}'
@@ -95,13 +88,43 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
+#        - apex-verify-danube:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *danube
+#        - apex-daily-danube:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *danube
+# 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
+            <<: *danube
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *danube
+# netvirt 3rd party ci
+        - virtual:
+            slave-label: odl-netvirt-virtual
+            installer: netvirt
+            <<: *master
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - orange-pod2:
+        - orange-pod1:
             slave-label: '{pod}'
             installer: joid
-            <<: *brahmaputra
+            <<: *master
         - orange-pod5:
             slave-label: '{pod}'
             installer: fuel
@@ -110,7 +133,7 @@
             slave-label: '{pod}'
             installer: joid
             <<: *master
-        - huawei-pod2:
+        - huawei-pod5:
             slave-label: '{pod}'
             installer: compass
             <<: *master
@@ -118,7 +141,11 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - arm-pod1:
+        - arm-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - arm-pod3:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -126,15 +153,44 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod1:
+        - zte-pod1:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
+        - zte-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - zte-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - zte-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *brahmaputra
+            <<: *danube
+        - arm-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
+        - arm-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
+# 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}'
@@ -148,22 +204,25 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - 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:
         - project-parameter:
             project: '{project}'
-        - '{slave-label}-defaults'
+            branch: '{branch}'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
         - string:
             name: DEPLOY_SCENARIO
@@ -172,16 +231,19 @@
             name: DOCKER_TAG
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
+        - string:
+            name: CLEAN_DOCKER_IMAGES
+            default: 'false'
+            description: 'Remove downloaded docker images (opnfv/functest:*)'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'functest-{testsuite}-builder'
 
 ########################
@@ -193,23 +255,40 @@
         - 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'
+        - string:
+            name: TESTCASE_OPTIONS
+            default: ''
+            description: 'Additional parameters specific to test case(s)'
 - parameter:
     name: functest-parameter
     parameters:
@@ -229,6 +308,10 @@
             name: CI_DEBUG
             default: 'false'
             description: "Show debug output information"
+        - string:
+            name: RC_FILE_PATH
+            default: ''
+            description: "Path to the OS credentials file if given"
 ########################
 # trigger macros
 ########################
@@ -247,6 +330,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
@@ -256,16 +349,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-daily.sh
+            !include-raw: ./functest-loop.sh
+
+- builder:
+    name: functest-suite
+    builders:
+        - shell:
+            !include-raw: ./functest-suite.sh
 
 - builder:
     name: set-functest-env
@@ -284,3 +383,9 @@
     builders:
         - shell:
             !include-raw: ./functest-cleanup.sh
+
+- builder:
+    name: functest-exit
+    builders:
+        - shell:
+            !include-raw: ./functest-exit.sh