From 8de7585f374097bcb4910bfbed34b6c721490db9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 25 Aug 2023 19:08:46 +0900
Subject: [PATCH] Disable GLOBAL_VENV

Devstack recently introduced the functionality to use a single venv [1]
but some devstack plugins in telemetry project are not compatible with
this change.

This disables the option as a short term workaround.

[1] https://review.opendev.org/c/openstack/devstack/+/558930

Change-Id: Ic300c90a19ca348b8316e63190e60b67f6b73ad3
Story: 2010912
Related-Bug: 2031639
Related-Bug: 2034891
---
 .zuul.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index c6395e16d..ce7bb3341 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,8 +20,16 @@
               - ^aodh/locale/.*$
               - ^tools/.*$
               - ^tox.ini$
+            vars:
+              # TODO: Update the plugins so they work with global venv
+              devstack_localrc:
+                GLOBAL_VENV: False
         - telemetry-dsvm-integration-ipv6-only:
             irrelevant-files: *aodh-irrelevant-files
+            vars:
+              # TODO: Update the plugins so they work with global venv
+              devstack_localrc:
+                GLOBAL_VENV: False
         - telemetry-dsvm-integration-centos-9s:
             irrelevant-files: *aodh-irrelevant-files
         - telemetry-dsvm-integration-centos-9s-fips:
@@ -32,8 +40,16 @@
         - aodh-tempest-plugin-postgresql
         - telemetry-dsvm-integration:
             irrelevant-files: *aodh-irrelevant-files
+            vars:
+              # TODO: Update the plugins so they work with global venv
+              devstack_localrc:
+                GLOBAL_VENV: False
         - telemetry-dsvm-integration-ipv6-only:
             irrelevant-files: *aodh-irrelevant-files
+            vars:
+              # TODO: Update the plugins so they work with global venv
+              devstack_localrc:
+                GLOBAL_VENV: False
         - telemetry-dsvm-integration-centos-9s:
             irrelevant-files: *aodh-irrelevant-files
         - telemetry-dsvm-integration-centos-9s-fips:
@@ -51,6 +67,8 @@
         DATABASE_TYPE: "postgresql"
         AODH_BACKEND: "postgresql"
         USE_PYTHON3: True
+        # TODO: Update the plugins so they work with global venv
+        GLOBAL_VENV: False
       tempest_test_regex: telemetry_tempest_plugin.aodh
 
 - job:
@@ -61,4 +79,6 @@
       devstack_localrc:
         AODH_BACKEND: "mysql"
         USE_PYTHON3: True
+        # TODO: Update the plugins so they work with global venv
+        GLOBAL_VENV: False
       tempest_test_regex: telemetry_tempest_plugin.aodh