summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-23 11:25:26 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-23 11:28:11 +0200
commit09ce74baa83f46ffd07bce6d92f01b3bf580bebb (patch)
treeb76fc3a44abbddb1b3c86934e2d0861fcd2494fa
parent8c9006fcc015706547514ec29baccbff3bb9a606 (diff)
Protect vs former OS env vars
rally_jobs is failing vs APEX which still sets OS_TENANT [1]. [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/324/console Change-Id: I672bfa93b37b1b773ea7d20fdd91bea0ff14b79f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 83e0e6836d7f5e18eb4eb8c9d28b4e6980b790c2)
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py5
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py5
2 files changed, 10 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index e5cdf9fe8..ac44de118 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -533,6 +533,11 @@ class RallyBase(singlevm.VmReady2):
OS_PROJECT_NAME=self.project.project.name,
OS_PROJECT_ID=self.project.project.id,
OS_PASSWORD=self.project.password)
+ try:
+ del environ['OS_TENANT_NAME']
+ del environ['OS_TENANT_ID']
+ except Exception: # pylint: disable=broad-except
+ pass
conf_utils.create_rally_deployment(environ=environ)
self.prepare_run()
self.run_tests()
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index d903411ab..73bb443ab 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -64,6 +64,11 @@ class TempestCommon(singlevm.VmReady2):
OS_PROJECT_NAME=self.project.project.name,
OS_PROJECT_ID=self.project.project.id,
OS_PASSWORD=self.project.password)
+ try:
+ del environ['OS_TENANT_NAME']
+ del environ['OS_TENANT_ID']
+ except Exception: # pylint: disable=broad-except
+ pass
self.deployment_id = conf_utils.create_rally_deployment(
environ=environ)
if not self.deployment_id: