X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=18fec99ad5c772c7ff5961b7a15c5603b8dab35e;hb=e5d71f0083ac5c343d206daab7d205c31999ffcc;hp=91ca5eb88c41247f082e54ec9962852bfaacf1e5;hpb=d7aca20b047d2cbbafca0e3b40390a30d251e33a;p=releng.git

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 91ca5eb88..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"
@@ -55,14 +38,12 @@ run_test() {
     cmd_opt="run_tests -t ${test_name}"
     # Determine which Functest image should be used for the test case
     case ${test_name} in
-        connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check)
+        connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check|tempest_smoke)
             FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;;
-        tempest_smoke_serial|tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican)
+        neutron-tempest-plugin-api|rally_sanity|refstack_defcore|tempest_full|tempest_scenario|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican)
             FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;;
-        shaker|vmtp)
+        rally_full|rally_jobs|shaker|vmtp)
             FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;;
-        tempest_full_parallel|tempest_full|tempest_scenario|rally_full)
-            FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;;
         cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc)
             FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
         doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os)
@@ -84,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
@@ -109,10 +90,6 @@ echo "Functest: Start Docker and prepare environment"
 echo "Functest: Download images that will be used by test cases"
 images_dir="${HOME}/opnfv/functest/images"
 download_script=${WORKSPACE}/functest/ci/download_images.sh
-if [[ ! -f ${download_script} ]]; then
-    # to support Danube as well
-    wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O ${download_script} 2> ${redirect}
-fi
 chmod +x ${download_script}
 ${download_script} ${images_dir} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect}
 
@@ -185,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:
@@ -248,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} \
@@ -267,19 +266,17 @@ 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)
+    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)
+        if [[ ${BRANCH} == "stable/gambia" ]]; then
+            tiers=(healthcheck smoke benchmarking features components)
         else
             tiers=(healthcheck smoke benchmarking features)
         fi