diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index b52cc8f2a1..dfe5437de8 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -327,9 +327,6 @@ if [ $(trueorfalse False MANILA_CONFIGURE_DEFAULT_TYPES) == True ]; then iniset $TEMPEST_CONFIG share default_share_type_name ${MANILA_DEFAULT_SHARE_TYPE:-default} fi -# check if tempest plugin was installed correctly -echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python - ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"} export OS_PROJECT_DOMAIN_NAME=$ADMIN_DOMAIN_NAME export OS_USER_DOMAIN_NAME=$ADMIN_DOMAIN_NAME @@ -379,6 +376,8 @@ fi echo "Running tempest manila test suites" cd $BASE/new/tempest/ +# List plugins in logs to enable debugging +sudo -H -u $USER tempest list-plugins sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY RETVAL=$? cd - diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml index 49674da561..005d57302d 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml @@ -44,21 +44,10 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" # Basic services needed for minimal job - OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - if [ "dummy" == "lvm" ]; then - # Enable glance for scenario tests - OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg - # Enable nova for scenario tests - OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj - # Enable neutron for scenario tests - OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt + export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest - # Enable mandatory placement services for nova starting with ocata - if [[ "stable/newton" != $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client - fi - fi - export OVERRIDE_ENABLED_SERVICES + export DEVSTACK_GATE_USE_PYTHON3=True + export PYTHON3_VERSION="3.6" # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1