From f7df90868e5bbbd48379201f879ed911f14428bc Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Wed, 10 Oct 2018 13:13:53 +0300 Subject: [PATCH] [ci] Fix checking cleanup Long time ago we added a special script which makes a dump of available resources before Rally launch and compares it to what we have after executing all workloads. Since cleanup issues relate to Rally code itself, it is fair to fail CI jobs only for our project and print warning at other projects' CI. Unfortunately, after moving OpenStack relasted plugins to the separate repository, we forgot to fix the check which identifies the type of job. Change-Id: I760d49a5f50eb223198f6e507e01c1a27d58c745 --- tests/ci/osresources.py | 3 ++- tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ci/osresources.py b/tests/ci/osresources.py index a9b0224d..c2ff8ef1 100755 --- a/tests/ci/osresources.py +++ b/tests/ci/osresources.py @@ -604,7 +604,8 @@ def main(): # projects, which have rally job, should not be affected by # this check, since in most cases resources are left due # to wrong cleanup of a particular scenario. - if os.environ.get("ZUUL_PROJECT") == "openstack/rally": + print(os.environ.get("ZUUL_PROJECT")) + if os.environ.get("ZUUL_PROJECT") == "openstack/rally-openstack": return 1 return 0 return 0 diff --git a/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml b/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml index 09a3ec8e..23b3dcb7 100644 --- a/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml +++ b/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml @@ -5,7 +5,6 @@ args: chdir: "{{ zuul.projects['git.openstack.org/openstack/rally-openstack'].src_dir }}" register: command_result - ignore_errors: True - name: Check results of listing resources shell: