From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 19 Apr 2020 10:48:33 +0000 (+0200)
Subject: Run sequentially tempest_heat
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bc678fe3051f81189e73923e8dfa0dd8721e696e;p=functest.git

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>
(cherry picked from commit c2e3d911d9eaf987d18b3b895778c411e62efc4a)
---

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 80ec81fb0..7172791a1 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 116133b1a..031c802f1 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 eb1872567..830799e4b 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -731,6 +731,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)