X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=9961f717eb51d0765bd6012f853d3944ebb0b098;hb=7d251e861b54f1a9d9ab192c7c65e5a810541e43;hp=667fc7b2ac57a30b8bd0e06d850c8409f6127fa8;hpb=b25aad403f6ed821053825516517040ef3988f36;p=releng.git

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 667fc7b2a..9961f717e 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,6 @@ run_test() {
 }
 
 
-[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
 redirect="/dev/stdout"
 FUNCTEST_DIR=/home/opnfv/functest
 DEPLOY_TYPE=baremetal
@@ -108,9 +88,6 @@ rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
 echo "Functest: Start Docker and prepare environment"
 
 echo "Functest: Download images that will be used by test cases"
-env
-pwd
-ls -l
 images_dir="${HOME}/opnfv/functest/images"
 download_script=${WORKSPACE}/functest/ci/download_images.sh
 chmod +x ${download_script}
@@ -128,7 +105,8 @@ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(ca
 envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
     -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
     -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE} -e CI_LOOP=${CI_LOOP} \
-    -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL}"
+    -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL} \
+    -e DEBUG=true"
 
 ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
@@ -179,12 +157,15 @@ 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
 image-feature-enabled:
     api_v2: true
     api_v1: false
+object-storage:
+    operator_role: SwiftOperator
 volume:
     storage_protocol: ceph
 volume-feature-enabled:
@@ -197,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
@@ -248,12 +230,56 @@ 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
+    ;;
+esac
 echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}"
 
 volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \
     ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \
     -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml"
 
+if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
+    blacklist_yaml=$(mktemp)
+    cat << EOF >> "${blacklist_yaml}"
+---
+-
+    scenarios:
+        - os-ovn-nofeature-ha
+    tests:
+        - neutron_tempest_plugin.api.admin.test_agent_management
+        - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler
+        - patrole_tempest_plugin.tests.api.network.test_agents_rbac
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id
+        - tempest.api.network.admin.test_agent_management
+        - tempest.api.network.admin.test_dhcp_agent_scheduler
+        - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+-
+    scenarios:
+        - os-nosdn-nofeature-ha
+    tests:
+        - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+-
+    scenarios:
+        - os-nosdn-nofeature-noha
+    tests:
+        - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+EOF
+    volumes="${volumes} -v ${blacklist_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml"
+fi
+
 ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
 echo 0 > ${ret_val_file}
 
@@ -269,20 +295,10 @@ 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)
-        else
-            tiers=(healthcheck smoke benchmarking features vnf components)
-        fi
+    if [ "${HOST_ARCH}" != "aarch64" ]; then
+        tiers=(healthcheck smoke benchmarking features vnf)
     else
-        if [[ ${BRANCH} == "stable/fraser" ]]; then
-            tiers=(healthcheck smoke features parser)
-            tests=(tempest_full_parallel)
-        else
-            tiers=(healthcheck smoke benchmarking features components)
-        fi
+        tiers=(healthcheck smoke benchmarking features)
     fi
     run_tiers ${tiers}
     if [ ${skip_tests} -eq 0 ]; then