X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=14143d2e8c86a61f0ccdc79b60188f9739c79d2d;hb=824a278e82c9bc5217d6f7c3d99511eb23334f70;hp=4f3c9ef98c36f9a7e426e249697f876b231ea974;hpb=d163f05fae737cd45250b4a7214812ba6172cbe9;p=releng.git

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 4f3c9ef98..14143d2e8 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -46,8 +46,6 @@ run_test() {
             FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${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)
-            FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
         *)
             echo "Unkown test case $test_name"
             exit 1
@@ -76,9 +74,6 @@ rc_file=${HOME}/opnfv-openrc.sh
 
 if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
     rc_file=$LAB_CONFIG/admin-openrc
-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_SCENARIO}" =~ -ha$ ]]; then
     cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
 fi
@@ -114,7 +109,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
@@ -122,20 +117,6 @@ if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-n
     envs="${envs} -e LIBVIRT_USER=ubuntu -e LIBVIRT_KEY_PATH=${FUNCTEST_DIR}/conf/libvirt_key"
 fi
 
-if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
-    ssh_key="/tmp/id_rsa"
-    user_config="/tmp/openstack_user_config.yml"
-    docker cp compass-tasks:/root/.ssh/id_rsa $ssh_key
-    docker cp compass-tasks:/etc/openstack_deploy/openstack_user_config.yml $user_config
-    sshkey_vol="-v ${ssh_key}:/root/.ssh/id_rsa"
-    userconfig_vol="-v ${user_config}:${user_config}"
-    envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}"
-fi
-
-if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then
-      envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080"
-fi
-
 if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then
     if [[ -n ${IMAGE_PROPERTIES} ]]; then
         IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large"
@@ -172,26 +153,6 @@ volume-feature-enabled:
     backup: false
 EOF
     ;;
-compass)
-    cat << EOF > "${tempest_conf_yaml}"
----
-compute-feature-enabled:
-    shelve: false
-    vnc_console: false
-    block_migration_for_live_migration: false
-    spice_console: true
-identity-feature-enabled:
-    api_v2: false
-    api_v2_admin: false
-image-feature-enabled:
-    api_v2: true
-    api_v1: false
-volume:
-    storage_protocol: ceph
-volume-feature-enabled:
-    backup: false
-EOF
-    ;;
 fuel)
     cat << EOF > "${tempest_conf_yaml}"
 ---
@@ -243,12 +204,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}"
 
@@ -302,17 +257,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 vnf)
     else
-        if [[ ${BRANCH} == "stable/gambia" ]]; then
-            tiers=(healthcheck smoke benchmarking features components)
-        else
-            tiers=(healthcheck smoke benchmarking features)
-        fi
+        tiers=(healthcheck smoke benchmarking)
     fi
     run_tiers ${tiers}
     if [ ${skip_tests} -eq 0 ]; then