Merge "Use old functest container for armband CI runs"

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index faa5971..276f688 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -113,7 +113,7 @@
               same-node: true
               block: true
         - trigger-builds:
-            - project: 'functest-{installer}-{pod}-daily-{stream}'
+            - project: 'functest-{installer}-{pod}-arm-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index b1d7e74..cbf1755 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -192,6 +192,8 @@
             job-timeout: 60
         - 'daily':
             job-timeout: 240
+        - 'arm-daily':
+            job-timeout: 240
 
     jobs:
         - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -298,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'
@@ -312,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: ''
@@ -368,6 +382,15 @@
         - '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:
     name: functest-suite-builder
     builders:
@@ -380,12 +403,10 @@
 - builder:
     name: functest-alpine-daily-builder
     builders:
-        - shell:
-            !include-raw:
-                - ./functest-env-presetup.sh
-                - ../../utils/fetch_os_creds.sh
-                - ./functest-alpine.sh
-                - ../../utils/push-test-logs.sh
+        - 'functest-cleanup'
+        - 'set-functest-env-alpine'
+        - 'functest-daily'
+        - 'functest-store-results'
 
 - builder:
     name: functest-daily
@@ -393,6 +414,11 @@
         - shell:
             !include-raw: ./functest-alpine.sh
 
+- builder:
+    name: functest-arm-daily
+    builders:
+        - shell:
+            !include-raw: ./functest-loop.sh
 
 - builder:
     name: functest-suite