From 5827d34499337aeeb924434b20289fa7e9d3a1c5 Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Sun, 20 Aug 2023 11:11:31 +0200
Subject: [PATCH] Re-enable rally-verify-tempest

Change-Id: Icbe31fc82eb7b7731b43c1346201b642be76ea4e
---
 .zuul.d/zuul.yaml                        |  4 +--
 tests/ci/playbooks/run-rally-verify.yaml | 42 ++++++++++++------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 964fd0a2..854090e8 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -80,7 +80,7 @@
             voting: false
         - rally-task-zaqar:
             voting: false
-        #- rally-verify-tempest
+        - rally-verify-tempest
     gate:
       jobs:
         - rally-tox-cover
@@ -119,7 +119,7 @@
               - rally_openstack/task/scenarios/neutron/trunk.py
               - rally_openstack/task/scenarios/neutron/network.py
               - tests/ci/playbooks
-        #- rally-verify-tempest
+        - rally-verify-tempest
     post:
       jobs:
         - rally-openstack-docker-build-and-push:
diff --git a/tests/ci/playbooks/run-rally-verify.yaml b/tests/ci/playbooks/run-rally-verify.yaml
index b07959fe..6b600ee6 100644
--- a/tests/ci/playbooks/run-rally-verify.yaml
+++ b/tests/ci/playbooks/run-rally-verify.yaml
@@ -1,21 +1,21 @@
-- hosts: all
-  roles:
-    - run-devstack
-
-- hosts: controller
-  tasks:
-    - name: Prepare env deployment for tempest
-      shell:
-        cmd: |
-          . /opt/stack/.rally/openrc admin admin
-          export OS_CACERT=/opt/stack/data/ca-bundle.pem
-          rally env create --from-sysenv --name tempest
-          rally env check
-        executable: /bin/bash
-
-    - name: Run Rally verify
-      shell:
-        cmd: |
-          cd {{ zuul.project.src_dir }}
-          python3 tests/ci/rally_verify.py
-        executable: /bin/bash
+- hosts: all
+  roles:
+  - run-devstack
+
+- hosts: controller
+  tasks:
+  - name: Prepare env deployment for tempest
+    shell:
+      cmd: |
+        . /opt/stack/.rally/openrc admin admin
+        export OS_CACERT=/opt/stack/data/ca-bundle.pem
+        rally env create --from-sysenv --name tempest
+        rally env check
+      executable: /bin/bash
+
+  - name: Run Rally verify
+    shell: |
+      . /opt/stack/data/venv/bin/activate
+      python3 tests/ci/rally_verify.py
+    args:
+      chdir: "{{ zuul.project.src_dir }}"