Browse Source

Convert dummy job to py3

Install all python packages for python3 and
run tempest with python 3.

Change-Id: If25075933b0b07a12814fda44ef5139a40c78f67
Tom Barron 3 months ago
parent
commit
8f88779778

+ 2
- 3
contrib/ci/post_test_hook.sh View File

@@ -327,9 +327,6 @@ if [ $(trueorfalse False MANILA_CONFIGURE_DEFAULT_TYPES) == True ]; then
327 327
     iniset $TEMPEST_CONFIG share default_share_type_name ${MANILA_DEFAULT_SHARE_TYPE:-default}
328 328
 fi
329 329
 
330
-# check if tempest plugin was installed correctly
331
-echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
332
-
333 330
 ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
334 331
 export OS_PROJECT_DOMAIN_NAME=$ADMIN_DOMAIN_NAME
335 332
 export OS_USER_DOMAIN_NAME=$ADMIN_DOMAIN_NAME
@@ -379,6 +376,8 @@ fi
379 376
 
380 377
 echo "Running tempest manila test suites"
381 378
 cd $BASE/new/tempest/
379
+# List plugins in logs to enable debugging
380
+sudo -H -u $USER tempest list-plugins
382 381
 sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
383 382
 RETVAL=$?
384 383
 cd -

+ 3
- 14
playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml View File

@@ -44,21 +44,10 @@
44 44
           export DEVSTACK_GATE_NEUTRON=1
45 45
           export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
46 46
           # Basic services needed for minimal job
47
-          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
47
+          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
55 48
 
56
-              # Enable mandatory placement services for nova starting with ocata
57
-              if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
58
-                 OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
59
-              fi
60
-          fi
61
-          export OVERRIDE_ENABLED_SERVICES
49
+          export DEVSTACK_GATE_USE_PYTHON3=True
50
+          export PYTHON3_VERSION="3.6"
62 51
 
63 52
           # Keep localrc to be able to set some vars in pre_test_hook
64 53
           export KEEP_LOCALRC=1

Loading…
Cancel
Save