X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=37189f84aac728f3b1e0cd130a792671c91f7a51;hb=7a5fddd061b4573d7e96ad7d6c49f456bb17e988;hp=2162bf828c3d378c1f5457e216734507cb5101b9;hpb=1e0279434d929c543cde79d4ffce731522f487c9;p=releng.git

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 2162bf828..37189f84a 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -114,7 +114,7 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
     COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
         "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
     IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi"
-    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
+    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e BLOCK_MIGRATION=false"
 fi
 
 if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then
@@ -157,6 +157,7 @@ apex)
 compute-feature-enabled:
     shelve: false
     vnc_console: true
+    block_migration_for_live_migration: false
 identity-feature-enabled:
     api_v2: false
     api_v2_admin: false
@@ -177,6 +178,7 @@ compass)
 compute-feature-enabled:
     shelve: false
     vnc_console: false
+    block_migration_for_live_migration: false
     spice_console: true
 identity-feature-enabled:
     api_v2: false
@@ -241,12 +243,6 @@ 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}"
 
@@ -300,17 +296,9 @@ else
     tests=()
     skip_tests=0
     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
+        tiers=(healthcheck smoke benchmarking features vnf)
     else
-        if [[ ${BRANCH} == "stable/gambia" ]]; then
-            tiers=(healthcheck smoke benchmarking features components)
-        else
-            tiers=(healthcheck smoke benchmarking features)
-        fi
+        tiers=(healthcheck smoke benchmarking features)
     fi
     run_tiers ${tiers}
     if [ ${skip_tests} -eq 0 ]; then