From 4f0a35c28f90d7aa8942d5d71dcda5b6055f6125 Mon Sep 17 00:00:00 2001
From: Brian Haley <haleyb.dev@gmail.com>
Date: Mon, 23 Oct 2023 21:02:38 +0000
Subject: [PATCH] Revert "Disable mysql gather performance in jobs"

This reverts commit 1d0335810d89ede47cf3b54614382cb25d1986ae.

Reason for revert: So we can look at a neutron DB
performance issue with devstack, see vPTG etherpad
for more info.

Change-Id: If2875caf9d14f1d13cee7e40b737e573252f0a7a
---
 zuul.d/grenade.yaml            | 3 ---
 zuul.d/rally.yaml              | 2 --
 zuul.d/tempest-multinode.yaml  | 5 -----
 zuul.d/tempest-singlenode.yaml | 6 ------
 4 files changed, 16 deletions(-)

diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml
index 956c21b9f37..0c35f846c39 100644
--- a/zuul.d/grenade.yaml
+++ b/zuul.d/grenade.yaml
@@ -40,7 +40,6 @@
     vars:
       grenade_devstack_localrc:
         shared:
-          MYSQL_GATHER_PERFORMANCE: false
           Q_AGENT: openvswitch
           Q_ML2_TENANT_NETWORK_TYPE: vxlan
           Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
@@ -118,7 +117,6 @@
     vars:
       grenade_devstack_localrc:
         shared:
-          MYSQL_GATHER_PERFORMANCE: false
           Q_AGENT: openvswitch
           Q_ML2_TENANT_NETWORK_TYPE: vxlan
           Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
@@ -280,7 +278,6 @@
           Q_BUILD_OVS_FROM_GIT: false
           OVN_BUILD_MODULES: false
         shared:
-          MYSQL_GATHER_PERFORMANCE: false
           Q_AGENT: ovn
           Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
           Q_ML2_TENANT_NETWORK_TYPE: geneve
diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml
index b76a9e2f893..7b50302c611 100644
--- a/zuul.d/rally.yaml
+++ b/zuul.d/rally.yaml
@@ -4,7 +4,6 @@
     timeout: 10800
     vars:
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         USE_PYTHON3: true
         OSPROFILER_COLLECTOR: redis
         OSPROFILER_HMAC_KEYS: "neutron-hmac-key-used-in-zuul-ci"
@@ -163,7 +162,6 @@
         s-object: false
         s-proxy: false
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         Q_AGENT: ovn
         ML2_L3_PLUGIN: ovn-router,trunk
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index 7f4396fc18d..d86914482a2 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -79,7 +79,6 @@
     vars:
       tox_envlist: integrated-network
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         MYSQL_REDUCE_MEMORY: true
         CIRROS_VERSION: 0.6.1
         DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
@@ -207,7 +206,6 @@
     vars:
       tox_envlist: integrated-network
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         MYSQL_REDUCE_MEMORY: true
         CIRROS_VERSION: 0.6.1
         DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
@@ -297,7 +295,6 @@
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         MYSQL_REDUCE_MEMORY: true
         CIRROS_VERSION: 0.6.1
         DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
@@ -427,7 +424,6 @@
             ovn:
               enable_distributed_floating_ip: True
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         MYSQL_REDUCE_MEMORY: true
         CIRROS_VERSION: 0.6.1
         DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
@@ -572,7 +568,6 @@
         '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
         '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         OVN_BUILD_FROM_SOURCE: True
         OVN_BRANCH: main
         # TODO(ykarel) move to master once OVN main branch is fixed to
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 3e9ccb8aa21..6c191e60b09 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -11,7 +11,6 @@
     vars:
       tempest_concurrency: 4
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         Q_ML2_TENANT_NETWORK_TYPE: vxlan
         MYSQL_REDUCE_MEMORY: true
       devstack_plugins:
@@ -53,7 +52,6 @@
     parent: neutron-tempest-base
     vars:
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         Q_AGENT: openvswitch
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
     irrelevant-files: &openvswitch-irrelevant-files
@@ -268,7 +266,6 @@
       - openstack/tempest
     vars:
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         MYSQL_SERVICE_NAME: mariadb
         MYSQL_REDUCE_MEMORY: true
       devstack_plugins:
@@ -427,7 +424,6 @@
     timeout: 10800
     vars:
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         # TODO(ykarel) can be enabled once
         # https://bugs.launchpad.net/neutron/+bug/1912359 fixed
         NEUTRON_DEPLOY_MOD_WSGI: false
@@ -505,7 +501,6 @@
             DEFAULT:
               rpc_workers: 0
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         MYSQL_REDUCE_MEMORY: true
         CIRROS_VERSION: 0.6.1
         DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
@@ -733,7 +728,6 @@
     vars:
       tox_envlist: integrated-network
       devstack_localrc:
-        MYSQL_GATHER_PERFORMANCE: false
         MYSQL_REDUCE_MEMORY: true
         CIRROS_VERSION: 0.6.1
         DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec