X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=3a22a1d0867c6e202c72753c51c7b0a6c6386165;hb=78f4ee940f970ebcf2e9d76c4f0013c0cbf61bb4;hp=f14ca758f69de5ce02117b95edccdeb069376232;hpb=7e427548729365e781ca539b4790b2c96de86f31;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index f14ca758f..3a22a1d08 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -14,8 +14,8 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
-    danube: &danube
-        stream: danube
+    euphrates: &euphrates
+        stream: euphrates
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         docker-tag: 'stable'
@@ -40,11 +40,11 @@
         - baremetal:
             slave-label: fuel-baremetal
             installer: fuel
-            <<: *danube
+            <<: *euphrates
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
-            <<: *danube
+            <<: *euphrates
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -57,11 +57,11 @@
         - baremetal:
             slave-label: joid-baremetal
             installer: joid
-            <<: *danube
+            <<: *euphrates
         - virtual:
             slave-label: joid-virtual
             installer: joid
-            <<: *danube
+            <<: *euphrates
 # compass CI PODs
         - baremetal:
             slave-label: compass-baremetal
@@ -74,11 +74,11 @@
         - baremetal:
             slave-label: compass-baremetal
             installer: compass
-            <<: *danube
+            <<: *euphrates
         - virtual:
             slave-label: compass-virtual
             installer: compass
-            <<: *danube
+            <<: *euphrates
 # apex CI PODs
         - virtual:
             slave-label: apex-virtual-master
@@ -89,13 +89,13 @@
             installer: apex
             <<: *master
         - virtual:
-            slave-label: apex-virtual-danube
+            slave-label: apex-virtual-euphrates
             installer: apex
-            <<: *danube
+            <<: *euphrates
         - baremetal:
-            slave-label: apex-baremetal-danube
+            slave-label: apex-baremetal-euphrates
             installer: apex
-            <<: *danube
+            <<: *euphrates
 # armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
@@ -108,11 +108,11 @@
         - armband-baremetal:
             slave-label: armband-baremetal
             installer: fuel
-            <<: *danube
+            <<: *euphrates
         - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
-            <<: *danube
+            <<: *euphrates
 # daisy CI PODs
         - baremetal:
             slave-label: daisy-baremetal
@@ -150,22 +150,6 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - arm-pod2:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *master
-        - arm-pod3:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *master
-        - arm-pod4:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *master
-        - arm-virtual1:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *master
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
@@ -173,7 +157,7 @@
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
-            <<: *danube
+            <<: *euphrates
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -185,23 +169,7 @@
         - zte-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *danube
-        - arm-pod2:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *danube
-        - arm-pod3:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *danube
-        - arm-pod4:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *danube
-        - arm-virtual1:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *danube
+            <<: *euphrates
 # PODs for verify jobs triggered by each patch upload
 #        - ool-virtual1:
 #            slave-label: '{pod}'
@@ -224,6 +192,8 @@
             job-timeout: 60
         - 'daily':
             job-timeout: 240
+        - 'arm-daily':
+            job-timeout: 240
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -327,33 +297,61 @@
     name: functest-daily-parameter
     parameters:
         - string:
-            name: FUNCTEST_SUITE_NAME
+            name: FUNCTEST_MODE
             default: 'daily'
             description: "Daily suite name to run"
+- parameter:
+    name: functest-arm-daily-parameter
+    parameters:
+        - string:
+            name: FUNCTEST_MODE
+            default: 'arm-daily'
+            description: "Daily suite name (Aarch64) to run"
 - parameter:
     name: functest-suite-parameter
     parameters:
+        - choice:
+            name: FUNCTEST_MODE
+            choices:
+                - 'tier'
+                - 'testcase'
+            default: 'tier'
+            description: "Test case or Tier to be run"
         - choice:
             name: FUNCTEST_SUITE_NAME
             choices:
-                - 'healthcheck'
+                - 'connection_check'
+                - 'api_check'
+                - 'snaps_health_check'
                 - 'vping_userdata'
                 - 'vping_ssh'
                 - 'tempest_smoke_serial'
                 - 'rally_sanity'
                 - 'odl'
                 - 'odl_netvirt'
-                - 'onos'
+                - 'snaps_smoke'
+                - 'refstack_defcore'
                 - 'promise'
                 - 'doctor'
                 - 'bgpvpn'
+                - 'parser'
                 - 'security_scan'
                 - 'tempest_full_parallel'
                 - 'rally_full'
-                - 'vims'
-                - 'multisite'
-                - 'parser'
-                - 'opera_vims'
+                - 'cloudify_ims'
+                - 'cloudify_vrouter'
+                - 'orchestra_openims'
+                - 'orchestra_clearwaterims'
+            default: 'connection_check'
+        - choice:
+            name: FUNCTEST_TIER
+            choices:
+                - 'healthcheck'
+                - 'smoke'
+                - 'features'
+                - 'components'
+                - 'vnf'
+            default: 'healthcheck'
         - string:
             name: TESTCASE_OPTIONS
             default: ''
@@ -396,22 +394,39 @@
     name: functest-daily-builder
     builders:
         - 'functest-cleanup'
-        - 'set-functest-env'
         - 'functest-daily'
         - 'functest-store-results'
         - 'functest-exit'
 
 - builder:
-    name: functest-suite-builder
+    name: functest-arm-daily-builder
     builders:
         - 'functest-cleanup'
         - 'set-functest-env'
+        - 'functest-arm-daily'
+        - 'functest-store-results'
+        - 'functest-exit'
+
+- builder:
+    name: functest-suite-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env-alpine'
         - 'functest-suite'
         - 'functest-store-results'
         - 'functest-exit'
 
 - builder:
     name: functest-alpine-daily-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env-alpine'
+        - 'functest-daily'
+        - 'functest-store-results'
+        - 'functest-exit'
+
+- builder:
+    name: functest-daily
     builders:
         - shell:
             !include-raw:
@@ -420,17 +435,17 @@
                 - ./functest-alpine.sh
 
 - builder:
-    name: functest-daily
+    name: functest-arm-daily
     builders:
         - shell:
             !include-raw: ./functest-loop.sh
 
-
 - builder:
     name: functest-suite
     builders:
         - shell:
-            !include-raw: ./functest-suite.sh
+            !include-raw:
+                - ./functest-alpine.sh
 
 - builder:
     name: set-functest-env
@@ -441,6 +456,14 @@
                 - ../../utils/fetch_os_creds.sh
                 - ./set-functest-env.sh
 
+- builder:
+    name: set-functest-env-alpine
+    builders:
+        - shell:
+            !include-raw:
+                - ./functest-env-presetup.sh
+                - ../../utils/fetch_os_creds.sh
+
 - builder:
     name: functest-store-results
     builders: