X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=9961f717eb51d0765bd6012f853d3944ebb0b098;hb=7d251e861b54f1a9d9ab192c7c65e5a810541e43;hp=796da8d6c54855867c5e2fcd8ec5d0824418ce72;hpb=34180ff2b4325960a6565f9d10ff04e6f85c0415;p=releng.git diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 796da8d6c..9961f717e 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -105,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" @@ -156,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 @@ -176,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 @@ -227,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} @@ -249,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