3 files changed, 72 insertions, 25 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index f0e08e171..35311c3a9 100644..100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -6,16 +6,20 @@ set +o pipefail
 
 [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
 FUNCTEST_DIR=/home/opnfv/functest
+DEPLOY_TYPE=baremetal
+[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt
+HOST_ARCH=$(uname -m)
 
 # Prepare OpenStack credentials volume
+rc_file=${HOME}/opnfv-openrc.sh
+
 if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
     rc_file=$LAB_CONFIG/admin-openrc
 elif [[ ${INSTALLER_TYPE} == 'compass' && ${BRANCH} == 'master' ]]; then
     cacert_file_vol="-v ${HOME}/os_cacert:${FUNCTEST_DIR}/conf/os_cacert"
     echo "export OS_CACERT=${FUNCTEST_DIR}/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh
-    rc_file=${HOME}/opnfv-openrc.sh
-else
-    rc_file=${HOME}/opnfv-openrc.sh
+elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
+    cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
 fi
 rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds"
 
@@ -25,10 +29,6 @@ if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FOR
     sudo iptables -I FORWARD -j RETURN
 fi
 
-DEPLOY_TYPE=baremetal
-[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt
-HOST_ARCH=$(uname -m)
-
 echo "Functest: Start Docker and prepare environment"
 
 echo "Functest: Download images that will be used by test cases"
@@ -68,12 +68,23 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file
 
 set +e
 
-tiers=(healthcheck smoke features vnf)
+if [ ${FUNCTEST_SUITE_NAME} == 'healthcheck' ]; then
+    tiers=(healthcheck)
+else
+    if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
+        tiers=(healthcheck smoke features vnf)
+    else
+        tiers=(healthcheck smoke features)
+    fi
+fi
+
+cmd_opt='prepare_env start && run_tests -r -t all'
+
 for tier in ${tiers[@]}; do
-    FUNCTEST_IMAGE=ollivier/functest-${tier}
+    FUNCTEST_IMAGE=opnfv/functest-${tier}
     echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
     docker pull ${FUNCTEST_IMAGE}>/dev/null
-    cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE}"
+    cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
     echo "Running Functest tier '${tier}'. CMD: ${cmd}"
-    ${cmd}
+    eval ${cmd}
 done
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index d34437265..23c6e490a 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}'
@@ -299,12 +301,21 @@
             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: ''
@@ -364,9 +378,16 @@
     name: functest-daily-builder
     builders:
         - 'functest-cleanup'
-        - 'set-functest-env'
         - '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:
@@ -381,20 +402,26 @@
 - 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-env-presetup.sh
                 - ../../utils/fetch_os_creds.sh
                 - ./functest-alpine.sh
-                - ../../utils/push-test-logs.sh
 
 - builder:
-    name: functest-daily
+    name: functest-arm-daily
     builders:
         - shell:
             !include-raw: ./functest-loop.sh
 
-
 - builder:
     name: functest-suite
     builders:
@@ -411,6 +438,14 @@
                 - ./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:
         - shell:
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index f18f054a5..bb79dacbe 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -51,14 +51,15 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
     -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
     -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
 
-if [[ ${INSTALLER_TYPE} == 'fuel' && ! -z ${SALT_MASTER_IP} ]]; then
-  HOST_ARCH=$(ssh -l ubuntu ${SALT_MASTER_IP} -i ${SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-  "sudo salt 'cmp*' grains.get cpuarch --out yaml |awk '{print \$2; exit}'")
-  envs="${envs} -e POD_ARCH=${HOST_ARCH}"
+ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+
+if [ "${INSTALLER_TYPE}" == 'fuel' ] && [ "$BRANCH" != 'stable/danube' ]; then
+    COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
+        "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
+    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
 fi
 
 if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-ha'* ]]; then
-    ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
     openo_msb_port=${openo_msb_port:-80}
     openo_msb_endpoint="$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \
     'mysql -ucompass -pcompass -Dcompass -e "select package_config from cluster;" \