Browse code

Merge "Ensure flavor_ref_alt is different from flavor_ref"

Jenkins authored on 2013/06/15 01:15:06
Showing 1 changed files
... ...
@@ -167,9 +167,15 @@ function configure_tempest() {
167 167
         fi
168 168
         flavor_ref=${flavors[0]}
169 169
         flavor_ref_alt=$flavor_ref
170
-        if [[ $num_flavors -gt 1 ]]; then
171
-            flavor_ref_alt=${flavors[1]}
172
-        fi
170
+
171
+        # ensure flavor_ref and flavor_ref_alt have different values
172
+        # some resize instance in tempest tests depends on this.
173
+        for f in ${flavors[@]:1}; do
174
+            if [[ $f -ne $flavor_ref ]]; then
175
+                flavor_ref_alt=$f
176
+                break
177
+            fi
178
+        done
173 179
     fi
174 180
 
175 181
     if [ "$Q_USE_NAMESPACE" != "False" ]; then