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)

diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index c5e1573..a9629d3 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -537,6 +537,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_env()
             self._run_tests()

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index cdd98e9..61649f4 100644 (file)
--- 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
         conf_utils.create_rally_deployment(environ=environ)
         conf_utils.create_verifier()
         self.verifier_id = conf_utils.get_verifier_id()