From ecbb9f16c603157000e0af2ffe43e4bd99e81c72 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Fri, 14 Mar 2014 10:51:13 -0700 Subject: [PATCH] Allow configurable large-ops tests This makes the large-ops job use the non-zero enable flag as the number of resources to configure instead of hard-coding it into the job. Since we can't merge this and the change to the job at the same time, this includes special support for the =1 case to run the same number we currently do (50). After both merge, the extra condition can be cleaned up with a test for ">0". Change-Id: I08c392bb620b5e911c721c806310749eeaba8ed0 --- devstack-vm-gate.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index ce17ce94..999f33eb 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -233,11 +233,16 @@ EOF fi if [ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]; then + # NOTE(danms): Temporary transition to =NUM_RESOURCES + echo "VIRT_DRIVER=fake" >> localrc + echo "TEMPEST_LARGE_OPS_NUMBER=50" >>localrc + elif [ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -gt "1" ]; then # use fake virt driver and 10 copies of nova-compute echo "VIRT_DRIVER=fake" >> localrc # To make debugging easier, disabled until bug 1218575 is fixed. # echo "NUMBER_FAKE_NOVA_COMPUTE=10" >>localrc - echo "TEMPEST_LARGE_OPS_NUMBER=50" >>localrc + echo "TEMPEST_LARGE_OPS_NUMBER=$DEVSTACK_GATE_TEMPEST_LARGE_OPS" >>localrc + fi if [ "$DEVSTACK_GATE_CONFIGDRIVE" -eq "1" ]; then