X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=cbf175567707e3c333e6cd3a639116002bf5f110;hb=6f8542addad7e4d99a77f139f84ae31ed873fbfa;hp=8de092d2993905da16f7e90ce0767c1949f2a8dc;hpb=0b8294a8fe66fab780dc79a2a10d33c66fa94f10;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 8de092d29..cbf175567 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -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
@@ -186,37 +170,34 @@
             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
 # PODs for verify jobs triggered by each patch upload
-        - ool-virtual1:
-            slave-label: '{pod}'
-            installer: apex
-            <<: *master
+#        - ool-virtual1:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *master
 #--------------------------------
 
+    alpine-pod:
+        - ericsson-virtual-pod1bl01:
+            slave-label: '{alpine-pod}'
+            installer: fuel
+            <<: *master
+        - huawei-virtual5:
+            slave-label: '{alpine-pod}'
+            installer: compass
+            <<: *master
+
     testsuite:
         - 'suite':
             job-timeout: 60
         - 'daily':
             job-timeout: 240
+        - 'arm-daily':
+            job-timeout: 240
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
+        - 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
 
 ################################
 # job template
@@ -269,6 +250,46 @@
             description: "Built on $NODE_NAME"
         - 'functest-{testsuite}-builder'
 
+- job-template:
+    name: 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
+
+    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: '{job-timeout}'
+            abort: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
+        - 'functest-{testsuite}-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-noha'
+        - functest-parameter:
+            gs-pathname: '{gs-pathname}'
+
+    scm:
+        - git-scm
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'functest-alpine-daily-builder'
+
 ########################
 # parameter macros
 ########################
@@ -279,13 +300,22 @@
             name: FUNCTEST_SUITE_NAME
             default: 'daily'
             description: "Daily suite name to run"
+- parameter:
+    name: functest-arm-daily-parameter
+    parameters:
+        - string:
+            name: FUNCTEST_SUITE_NAME
+            default: 'arm-daily'
+            description: "Daily suite name (Aarch64) to run"
 - parameter:
     name: functest-suite-parameter
     parameters:
         - choice:
             name: FUNCTEST_SUITE_NAME
             choices:
-                - 'healthcheck'
+                - 'connection_check'
+                - 'api_check'
+                - 'snaps_health_check'
                 - 'vping_userdata'
                 - 'vping_ssh'
                 - 'tempest_smoke_serial'
@@ -293,16 +323,19 @@
                 - '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'
         - string:
             name: TESTCASE_OPTIONS
             default: ''
@@ -345,9 +378,17 @@
     name: functest-daily-builder
     builders:
         - 'functest-cleanup'
-        - 'set-functest-env'
+        - 'set-functest-env-alpine'
         - 'functest-daily'
         - 'functest-store-results'
+
+- builder:
+    name: functest-arm-daily-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env'
+        - 'functest-arm-daily'
+        - 'functest-store-results'
         - 'functest-exit'
 
 - builder:
@@ -359,12 +400,25 @@
         - 'functest-store-results'
         - 'functest-exit'
 
+- builder:
+    name: functest-alpine-daily-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env-alpine'
+        - 'functest-daily'
+        - 'functest-store-results'
+
 - builder:
     name: functest-daily
     builders:
         - shell:
-            !include-raw: ./functest-loop.sh
+            !include-raw: ./functest-alpine.sh
 
+- builder:
+    name: functest-arm-daily
+    builders:
+        - shell:
+            !include-raw: ./functest-loop.sh
 
 - builder:
     name: functest-suite
@@ -381,6 +435,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: