X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=18fec99ad5c772c7ff5961b7a15c5603b8dab35e;hb=086d54dd3d1f7519ab1753ce445ead91b72f2d9f;hp=45f88ba3974edd4ee3b85bfb1fcde29fdc88387d;hpb=3dec90dac96dd70b7ab465fdf894a50f10f7c99c;p=releng.git

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 45f88ba39..18fec99ad 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -10,23 +10,6 @@ TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
 ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources
 DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})}
 
-check_os_deployment() {
-    FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG}
-    echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
-    docker pull ${FUNCTEST_IMAGE}>/dev/null
-    cmd="docker run --rm ${volumes} ${FUNCTEST_IMAGE} check_deployment"
-    echo "Checking deployment, CMD: ${cmd}"
-    eval ${cmd}
-    ret_value=$?
-    if [ ${ret_value} != 0 ]; then
-        echo "ERROR: Problem while checking OpenStack deployment."
-        exit 1
-    else
-        echo "OpenStack deployment OK."
-    fi
-
-}
-
 run_tiers() {
     tiers=$1
     cmd_opt="run_tests -r -t all"
@@ -82,7 +65,7 @@ run_test() {
 }
 
 
-[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+redirect="/dev/stdout"
 FUNCTEST_DIR=/home/opnfv/functest
 DEPLOY_TYPE=baremetal
 [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt
@@ -179,6 +162,8 @@ identity-feature-enabled:
 image-feature-enabled:
     api_v2: true
     api_v1: false
+object-storage:
+    operator_role: SwiftOperator
 volume:
     storage_protocol: ceph
 volume-feature-enabled:
@@ -242,6 +227,26 @@ volume-feature-enabled:
 EOF
     ;;
 esac
+case ${BRANCH} in
+master)
+    cat << EOF >> "${tempest_conf_yaml}"
+compute:
+    max_microversion: latest
+EOF
+    ;;
+stable/hunter)
+    cat << EOF >> "${tempest_conf_yaml}"
+compute:
+    max_microversion: 2.65
+EOF
+    ;;
+stable/gambia)
+    cat << EOF >> "${tempest_conf_yaml}"
+compute:
+    max_microversion: 2.60
+EOF
+    ;;
+esac
 echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}"
 
 volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \
@@ -263,21 +268,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