From 6dc2c395487d9ae69a6b23b9616d9f28e2de0cbf Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 23 Sep 2018 11:25:26 +0200 Subject: Protect vs former OS env vars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 83e0e6836d7f5e18eb4eb8c9d28b4e6980b790c2) --- functest/opnfv_tests/openstack/rally/rally.py | 5 +++++ functest/opnfv_tests/openstack/tempest/tempest.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index c5e157393..a9629d359 100644 --- 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 cdd98e9ef..61649f42e 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 conf_utils.create_rally_deployment(environ=environ) conf_utils.create_verifier() self.verifier_id = conf_utils.get_verifier_id() -- cgit 1.2.3-korg