From 958e63341a3a9dbf9a10d5c0bf5dcf6145a78bd5 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Wed, 9 Dec 2015 11:50:06 -0500 Subject: [PATCH] Gate: Attempt to fix a memory allocation error This random error is due to the different swap space at different test hosts. In particular, there is a provider who provides VMs with 0 swap space, while other providers provide VMs with 8G swap space. As a result, Magnum jobs failed at VMs with 0 swap space. This commit reduces memory consumption of Magnum jobs by reducing the bay node flavor from 2G to 1G. I consider this as a temporary fix. A permanent fix should be from infra side to make the swap space consistent across test nodes. Partial-Bug: #1521237 Change-Id: Ia043fab1f7665f7299e4094634e02c42b43dcce1 --- doc/source/dev/dev-functional-test.rst | 2 +- magnum/tests/contrib/post_test_hook.sh | 2 +- magnum/tests/functional/python_client_base.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/source/dev/dev-functional-test.rst b/doc/source/dev/dev-functional-test.rst index 0ebf6846fd..c2008e7aec 100644 --- a/doc/source/dev/dev-functional-test.rst +++ b/doc/source/dev/dev-functional-test.rst @@ -40,7 +40,7 @@ Create the necessary keypair and flavor:: source /opt/stack/devstack/openrc admin admin nova keypair-add --pub-key ~/.ssh/id_rsa.pub default - nova flavor-create m1.magnum 100 2048 8 1 + nova flavor-create m1.magnum 100 1024 8 1 source /opt/stack/devstack/openrc demo demo nova keypair-add --pub-key ~/.ssh/id_rsa.pub default diff --git a/magnum/tests/contrib/post_test_hook.sh b/magnum/tests/contrib/post_test_hook.sh index 75f8180336..b14d630155 100755 --- a/magnum/tests/contrib/post_test_hook.sh +++ b/magnum/tests/contrib/post_test_hook.sh @@ -94,7 +94,7 @@ nova keypair-add --pub-key ~/.ssh/id_rsa.pub default # Create magnum specific flavor for use in functional tests. echo_summary "Create a flavor" -nova flavor-create m1.magnum 100 2048 8 1 +nova flavor-create m1.magnum 100 1024 8 1 # Run functional tests # Currently we support functional-api, functional-k8s, will support swarm, diff --git a/magnum/tests/functional/python_client_base.py b/magnum/tests/functional/python_client_base.py index 2ea7e68c50..fbb690e1f8 100644 --- a/magnum/tests/functional/python_client_base.py +++ b/magnum/tests/functional/python_client_base.py @@ -117,6 +117,7 @@ class BaseMagnumClient(base.TestCase): external_network_id=cls.nic_id, image_id=cls.image_id, flavor_id=cls.flavor_id, + master_flavor_id=cls.flavor_id, docker_volume_size=docker_volume_size, network_driver=network_driver, coe=coe,