commit 5a4f09ade63262ad7fe0f4c9a22af8a1e588e74d
author Jenkins <jenkins@review.openstack.org> Wed Nov 09 02:21:54 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 09 02:21:54 2016 +0000
tree 112e28f58a8a17377103ebc643f12145977470d4
parent b8259274093ce91aea7d873cbf45982d66ac123d
parent fa535cfeda40212af56f237c8c39daf184aed862

Merge "m1.tiny is not always there"

functional/test_autoscaling.py

diff --git a/functional/test_autoscaling.py b/functional/test_autoscaling.py
index 5af512a..369fa00 100644
--- a/functional/test_autoscaling.py
+++ b/functional/test_autoscaling.py
@@ -495,7 +495,7 @@
         policy['MaxBatchSize'] = '3'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.minimal_instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=10,
@@ -516,7 +516,7 @@
         policy['MaxBatchSize'] = '4'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.minimal_instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=8,

functional/test_instance_group.py

diff --git a/functional/test_instance_group.py b/functional/test_instance_group.py
index e8f0309..44b3aa9 100644
--- a/functional/test_instance_group.py
+++ b/functional/test_instance_group.py
@@ -469,7 +469,7 @@
         policy['MaxBatchSize'] = '3'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=5,
@@ -491,7 +491,7 @@
         policy['MaxBatchSize'] = '4'
         policy['PauseTime'] = 'PT0S'
         config = updt_template['Resources']['JobServerConfig']
-        config['Properties']['InstanceType'] = 'm1.tiny'
+        config['Properties']['InstanceType'] = self.conf.instance_type
 
         self.update_instance_group(updt_template,
                                    num_updates_expected_on_updt=2,