aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-19 12:48:33 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-19 13:29:18 +0200
commitc2e3d911d9eaf987d18b3b895778c411e62efc4a (patch)
tree09a4c1fe0c791b0bf8c1b72da29d840446fecde5
parent0c296f207e82b9253235ff86c25dc2223a495c9a (diff)
Run sequentially tempest_heat
It's forced by design else it remains a few resources. It also sets fixed_subnet_name and network_for_ssh to avoid falsy discovery as it seems [1] [1] http://artifacts.opnfv.org/functest/X5GDYF3B0R2B/functest-opnfv-functest-smoke-jerma-tempest_heat-run-18/tempest_heat/tempest-report.html Change-Id: Ieb584ddc1c0b4ebb543e9d69277a20aaee0fbac0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/smoke/testcases.yaml2
-rw-r--r--functest/ci/testcases.yaml2
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 5b918991d..6123e370f 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -67,7 +67,7 @@ tiers:
args:
mode: '^heat_tempest_plugin.tests'
option:
- - '--concurrency=4'
+ - '--concurrency=1'
-
case_name: rally_sanity
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a48b2c2a3..12c9138c3 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -245,7 +245,7 @@ tiers:
args:
mode: '^heat_tempest_plugin.tests'
option:
- - '--concurrency=4'
+ - '--concurrency=1'
-
case_name: rally_sanity
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 14fa9f1c7..a8ea9af39 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -724,6 +724,8 @@ class TempestHeat(TempestCommon):
rconfig.set('heat_plugin', 'minimal_instance_type', self.flavor.id)
rconfig.set('heat_plugin', 'floating_network_name', self.ext_net.name)
rconfig.set('heat_plugin', 'fixed_network_name', self.network.name)
+ rconfig.set('heat_plugin', 'fixed_subnet_name', self.subnet.name)
+ rconfig.set('heat_plugin', 'network_for_ssh', self.network.name)
with open(self.conf_file, 'w') as config_file:
rconfig.write(config_file)
self.backup_tempest_config(self.conf_file, self.res_dir)