From 63a71a231638b8ed3390d04b986b8db177e4ab13 Mon Sep 17 00:00:00 2001 From: Adalberto Medeiros Date: Thu, 6 Jun 2013 08:46:04 -0400 Subject: [PATCH] Ensure flavor_ref_alt is different from flavor_ref For tempest, server resize tests needs different values for flavors to pass. Ensure different values in tempest.conf for flavor_ref_alt and flavor_ref. Change-Id: I2f8ee92967abc767637e334ae483b540dd7d5b78 Fix: bug 1187768 --- lib/tempest | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/tempest b/lib/tempest index e59737bb2b..1a9cad2862 100644 --- a/lib/tempest +++ b/lib/tempest @@ -166,9 +166,15 @@ function configure_tempest() { fi flavor_ref=${flavors[0]} flavor_ref_alt=$flavor_ref - if [[ $num_flavors -gt 1 ]]; then - flavor_ref_alt=${flavors[1]} - fi + + # ensure flavor_ref and flavor_ref_alt have different values + # some resize instance in tempest tests depends on this. + for f in ${flavors[@]:1}; do + if [[ $f -ne $flavor_ref ]]; then + flavor_ref_alt=$f + break + fi + done fi if [ "$Q_USE_NAMESPACE" != "False" ]; then