X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=e08cb8d0855094887768ced5eafc77570cc43eea;hb=2ba337ee3af276a84f44e2041c562fa2dc071f4a;hp=42bf60b0a1e789f6d455a68d7d43a3e8edce40e0;hpb=ff24d1980c7bb39f38110c95ae5dbc08ac430cf3;p=releng.git diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 42bf60b0a..e08cb8d08 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -98,7 +98,7 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then elif [[ ${INSTALLER_TYPE} == 'compass' ]]; 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 -elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then +elif [[ ${INSTALLER_TYPE} == 'fuel' ]] && [[ "${DEPLOY_SCENARIO}" =~ -ha$ ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi @@ -267,21 +267,21 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then tiers=(${FUNCTEST_TIER}) run_tiers ${tiers} else - tests=(tempest_full tempest_scenario) + 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) else - tiers=(healthcheck smoke benchmarking features vnf) + tiers=(healthcheck smoke benchmarking features vnf components) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) tests=(tempest_full_parallel) else - tiers=(healthcheck smoke benchmarking features) + tiers=(healthcheck smoke benchmarking features components) fi fi run_tiers ${tiers}