commit 557d47065db22bfd982b424e62eaca0c4a42e637
author Jenkins <jenkins@review.openstack.org> Sat Feb 01 07:57:19 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Feb 01 07:57:19 2014 +0000
tree 4a7dfcfd8484cdf0803898810378708d4e4c9476
parent 528b07853ea2e3e4ab236365ce8c380290717a86
parent 99901c043edda0cc8cc3fd39986615b64f6a72f2

Merge "Matches one flavor and one image by default"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index f7f74b8..48ca905 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -494,7 +494,7 @@
 
 # Matching flavors become parameters for scenario tests
 # (string value)
-#flavor_regex=^m1.(micro|nano|tiny)$
+#flavor_regex=^m1.nano$
 
 # SSH verification in tests is skippedfor matching images
 # (string value)

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 66fbed3..ccb3125 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -667,7 +667,7 @@
                default='^cirros-0.3.1-x86_64-uec$',
                help="Matching images become parameters for scenario tests"),
     cfg.StrOpt('flavor_regex',
-               default='^m1.(micro|nano|tiny)$',
+               default='^m1.nano$',
                help="Matching flavors become parameters for scenario tests"),
     cfg.StrOpt('non_ssh_image_regex',
                default='^.*[Ww]in.*$',