Merge "Change version of tempest from >=17.1.0 to internal mcp/pike" into mcp/queens
diff --git a/.gitreview b/.gitreview
index 9c33d46..03893df 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
-
[gerrit]
-host=review.openstack.org
+host=gerrit.mcp.mirantis.net
port=29418
-project=openstack/heat-tempest-plugin.git
+project=packaging/sources/heat-tempest-plugin.git
+defaultbranch=mcp/queens
diff --git a/heat_tempest_plugin/config.py b/heat_tempest_plugin/config.py
index d658a98..ced87e3 100644
--- a/heat_tempest_plugin/config.py
+++ b/heat_tempest_plugin/config.py
@@ -153,7 +153,9 @@
cfg.StrOpt('heat_config_notify_script',
default=('heat-config-notify'),
help="Path to the script heat-config-notify"),
-
+ cfg.StrOpt('hidden_stack_tag',
+ default='data-processing-cluster',
+ help="Tag to be considered as hidden for stack tags tests"),
]
diff --git a/heat_tempest_plugin/tests/functional/test_stack_tags.py b/heat_tempest_plugin/tests/functional/test_stack_tags.py
index 7d3d52a..55c262d 100644
--- a/heat_tempest_plugin/tests/functional/test_stack_tags.py
+++ b/heat_tempest_plugin/tests/functional/test_stack_tags.py
@@ -72,7 +72,7 @@
@decorators.idempotent_id('5ed79584-0684-4f9c-ae8e-44a8f874ec79')
def test_hidden_stack(self):
# Stack create with hidden stack tag
- tags = 'foo,hidden'
+ tags = 'foo,%s' % self.conf.hidden_stack_tag
self.stack_create(
template=self.template,
tags=tags)
diff --git a/heat_tempest_plugin/tests/scenario/test_server_signal.py b/heat_tempest_plugin/tests/scenario/test_server_signal.py
index a43c74a..1823087 100644
--- a/heat_tempest_plugin/tests/scenario/test_server_signal.py
+++ b/heat_tempest_plugin/tests/scenario/test_server_signal.py
@@ -29,6 +29,7 @@
'key_name': self.keypair_name,
'flavor': flavor,
'image': image,
+ 'public_net': self.conf.floating_network_name,
'timeout': self.conf.build_timeout,
'user_data_format': user_data_format
}