summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Barron <tpb@dyncloud.net>2019-01-08 05:30:57 -0500
committerTom Barron <tpb@dyncloud.net>2019-01-08 19:05:53 +0000
commit8f88779778f76df32d43d321b45a1ba37613c514 (patch)
tree662eba487a375260b6c6631319aaa3e5065033c9
parent165e28ad84997e266b86d98894fa0ad857452647 (diff)
Convert dummy job to py3
Install all python packages for python3 and run tempest with python 3. Change-Id: If25075933b0b07a12814fda44ef5139a40c78f67
Notes
Notes (review): Code-Review+2: xing-yang <xingyang105@gmail.com> Code-Review+2: Ben Swartzlander <ben@swartzlander.org> Workflow+1: Ben Swartzlander <ben@swartzlander.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 08 Jan 2019 23:26:42 +0000 Reviewed-on: https://review.openstack.org/629143 Project: openstack/manila Branch: refs/heads/master
-rwxr-xr-xcontrib/ci/post_test_hook.sh5
-rw-r--r--playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml17
2 files changed, 5 insertions, 17 deletions
diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh
index b52cc8f..dfe5437 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
327 iniset $TEMPEST_CONFIG share default_share_type_name ${MANILA_DEFAULT_SHARE_TYPE:-default} 327 iniset $TEMPEST_CONFIG share default_share_type_name ${MANILA_DEFAULT_SHARE_TYPE:-default}
328fi 328fi
329 329
330# check if tempest plugin was installed correctly
331echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
332
333ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"} 330ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
334export OS_PROJECT_DOMAIN_NAME=$ADMIN_DOMAIN_NAME 331export OS_PROJECT_DOMAIN_NAME=$ADMIN_DOMAIN_NAME
335export OS_USER_DOMAIN_NAME=$ADMIN_DOMAIN_NAME 332export OS_USER_DOMAIN_NAME=$ADMIN_DOMAIN_NAME
@@ -379,6 +376,8 @@ fi
379 376
380echo "Running tempest manila test suites" 377echo "Running tempest manila test suites"
381cd $BASE/new/tempest/ 378cd $BASE/new/tempest/
379# List plugins in logs to enable debugging
380sudo -H -u $USER tempest list-plugins
382sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY 381sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
383RETVAL=$? 382RETVAL=$?
384cd - 383cd -
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
index 49674da..005d573 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 @@
44 export DEVSTACK_GATE_NEUTRON=1 44 export DEVSTACK_GATE_NEUTRON=1
45 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" 45 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
46 # Basic services needed for minimal job 46 # Basic services needed for minimal job
47 OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest 47 export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
48 if [ "dummy" == "lvm" ]; then
49 # Enable glance for scenario tests
50 OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
51 # Enable nova for scenario tests
52 OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
53 # Enable neutron for scenario tests
54 OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
55 48
56 # Enable mandatory placement services for nova starting with ocata 49 export DEVSTACK_GATE_USE_PYTHON3=True
57 if [[ "stable/newton" != $ZUUL_BRANCH ]]; then 50 export PYTHON3_VERSION="3.6"
58 OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
59 fi
60 fi
61 export OVERRIDE_ENABLED_SERVICES
62 51
63 # Keep localrc to be able to set some vars in pre_test_hook 52 # Keep localrc to be able to set some vars in pre_test_hook
64 export KEEP_LOCALRC=1 53 export KEEP_LOCALRC=1