diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index 77b311ab8..387041505 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -108,9 +108,6 @@ class { 'openstack_integration::tempest': # NOTE(tkajinam): The scenario job we enable requires cinder, which is not # enabled in this scenario. heat => false, - # NOTE(tobias-urdin): We have tempest disabled because we cannot - # run it when instances does not have internet acces to - # deploy for example Docker. - magnum => false, + magnum => true, neutron_driver => 'ovn', } diff --git a/manifests/tempest.pp b/manifests/tempest.pp index dbd3d98bd..5f3117501 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -364,6 +364,7 @@ class openstack_integration::tempest ( if $magnum { class { 'tempest::magnum': + provision_image => false, tempest_config_file => '/tmp/openstack/tempest/etc/tempest.conf', } } diff --git a/run_tests.sh b/run_tests.sh index 2c39dc9ee..cf4213f8b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -285,11 +285,7 @@ echo "ironic_tempest_plugin.tests.api.admin.test_drivers" >> /tmp/openstack/temp # deploy docker for example. # Magnum #echo "test_create_list_sign_delete_clusters" >> /tmp/openstack/tempest/test-include-list.txt -# Below is here just for testing in ci, would be removed soon, at least below version of werkzeug is required for magnum tls to work -#if is_fedora; then -# $SUDO yum -y install http://cbs.centos.org/kojifiles/packages/python-werkzeug/0.11.6/1.el7/noarch/python-werkzeug-0.11.6-1.el7.noarch.rpm -# $SUDO systemctl restart openstack-magnum-* -#fi +echo "magnum_tempest_plugin.tests.api.v1.test_magnum_service.MagnumServiceTest" >> /tmp/openstack/tempest/test-include-list.txt # Zaqar echo "v2.test_queues.TestManageQueue" >> /tmp/openstack/tempest/test-include-list.txt