Fix container list logics

The previous logic is buggy (e.g. vnfs are executed if arm64 [1])
Vnf images have been hugely reduced that allows testing them in
virtual deployments (see functest-virtual [2])

[1] https://build.opnfv.org/ci/view/functest%20(Installer%20gates)/job/functest-fuel-baremetal-daily-master/lastFailedBuild/console
[2] https://build.opnfv.org/ci/view/functest/job/functest-latest-daily/76/

Change-Id: Iec26708b66cbf3fe92849425f2afdf39a89d4bbe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 8c29249..7771f17 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -263,21 +263,15 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then
 else
     tests=()
     skip_tests=0
-    if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
-        if [[ ${BRANCH} == "stable/fraser" ]]; then
-            tiers=(healthcheck smoke features vnf parser)
-            tests=(tempest_full_parallel)
-        elif [[ ${BRANCH} == "stable/gambia" ]]; then
+    if [ "${HOST_ARCH}" != "aarch64" ]; then
+        if [[ ${BRANCH} == "stable/gambia" ]]; then
             tiers=(healthcheck smoke benchmarking features vnf components)
         else
             tiers=(healthcheck smoke benchmarking features vnf)
         fi
     else
-        if [[ ${BRANCH} == "stable/fraser" ]]; then
-            tiers=(healthcheck smoke features parser)
-            tests=(tempest_full_parallel)
-        elif [[ ${BRANCH} == "stable/gambia" ]]; then
-            tiers=(healthcheck smoke benchmarking features vnf components)
+        if [[ ${BRANCH} == "stable/gambia" ]]; then
+            tiers=(healthcheck smoke benchmarking features components)
         else
             tiers=(healthcheck smoke benchmarking features)
         fi