From acc21264c88ed92145fe8f247b22dd0fbcacc321 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Sun, 19 Apr 2020 12:48:33 +0200
Subject: [PATCH] Run sequentially tempest_heat
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
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)
---
docker/smoke/testcases.yaml | 2 +-
functest/ci/testcases.yaml | 2 +-
functest/opnfv_tests/openstack/tempest/tempest.py | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 67b6b5451..963ed09d1 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 86fd7bd3d..a42665eff 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 354f3b04d..282f894ac 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -732,6 +732,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)
--
2.16.6