From cd33cda96da7e496f9c382bc0039f28a4e1f2145 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 10 Mar 2019 11:25:33 +0100 Subject: Fix container list logics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- jjb/functest/functest-alpine.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'jjb') diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8c29249e1..7771f171d 100755 --- 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 -- cgit 1.2.3-korg