Skip to content

Commit f756470

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Ensure flavor_ref_alt is different from flavor_ref"
2 parents c377145 + 63a71a2 commit f756470

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

lib/tempest

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,15 @@ function configure_tempest() {
167167
fi
168168
flavor_ref=${flavors[0]}
169169
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
173179
fi
174180

175181
if [ "$Q_USE_NAMESPACE" != "False" ]; then

0 commit comments

Comments
 (0)