From 6f8542addad7e4d99a77f139f84ae31ed873fbfa Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Tue, 12 Sep 2017 08:44:00 +0200
Subject: [PATCH] Use old functest container for armband CI runs

Functest Alpine not supported yet for aarch64 architecture.
Task for Armband project but until support could be done, the
traditionnal docker shall be used for armband tests

usage of alpine leads to errors [1]

[1]: https://build.opnfv.org/ci/view/functest/job/functest-fuel-armband-baremetal-daily-master/214/console

Change-Id: I48e05a0c7cd97989784fd97348bd331425c4877e
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
 jjb/armband/armband-ci-jobs.yml      |  2 +-
 jjb/functest/functest-daily-jobs.yml | 48 +++++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index faa5971e1..276f68809 100644
--- 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 b1d7e748d..cbf175567 100644
--- 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
-- 
2.16.6