diff --git a/magnum/tests/contrib/post_test_hook.sh b/magnum/tests/contrib/post_test_hook.sh index cb91098532..3acd353051 100755 --- a/magnum/tests/contrib/post_test_hook.sh +++ b/magnum/tests/contrib/post_test_hook.sh @@ -80,6 +80,10 @@ EOF echo_summary "Generate a key-pair" nova keypair-add default +# Create magnum specific flavor for use in functional tests. +echo_summary "Create a flavor" +nova flavor-create m1.magnum 100 2048 8 1 + # Run functional tests echo "Running magnum functional test suite" sudo -E -H -u jenkins tox -e functional -- --concurrency=1 @@ -89,6 +93,10 @@ EXIT_CODE=$? echo_summary "Running keypair-delete" nova keypair-delete default +# Delete the flavor used in the functional test. +echo_summary "Running flavor-delete" +nova flavor-delete m1.magnum + # Save the logs sudo mv ../logs/* /opt/stack/logs/ diff --git a/magnum/tests/functional/test_magnum_python_client.py b/magnum/tests/functional/test_magnum_python_client.py index b96136fcae..6212cbea56 100644 --- a/magnum/tests/functional/test_magnum_python_client.py +++ b/magnum/tests/functional/test_magnum_python_client.py @@ -93,8 +93,8 @@ class BaseMagnumClient(base.TestCase): keypair_id='default', external_network_id=cls.nic_id, image_id=cls.image_id, - flavor_id='m1.small', - docker_volume_size=5, + flavor_id='m1.magnum', + docker_volume_size=1, coe='kubernetes', ) return baymodel