diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index 0c35f846c39..956c21b9f37 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -40,6 +40,7 @@ vars: grenade_devstack_localrc: shared: + MYSQL_GATHER_PERFORMANCE: false Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch @@ -117,6 +118,7 @@ vars: grenade_devstack_localrc: shared: + MYSQL_GATHER_PERFORMANCE: false Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch @@ -278,6 +280,7 @@ 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 7b50302c611..b76a9e2f893 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -4,6 +4,7 @@ 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" @@ -162,6 +163,7 @@ 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 d86914482a2..7f4396fc18d 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -79,6 +79,7 @@ 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 @@ -206,6 +207,7 @@ 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 @@ -295,6 +297,7 @@ 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 @@ -424,6 +427,7 @@ 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 @@ -568,6 +572,7 @@ '{{ 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 6c191e60b09..3e9ccb8aa21 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -11,6 +11,7 @@ vars: tempest_concurrency: 4 devstack_localrc: + MYSQL_GATHER_PERFORMANCE: false Q_ML2_TENANT_NETWORK_TYPE: vxlan MYSQL_REDUCE_MEMORY: true devstack_plugins: @@ -52,6 +53,7 @@ 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 @@ -266,6 +268,7 @@ - openstack/tempest vars: devstack_localrc: + MYSQL_GATHER_PERFORMANCE: false MYSQL_SERVICE_NAME: mariadb MYSQL_REDUCE_MEMORY: true devstack_plugins: @@ -424,6 +427,7 @@ 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 @@ -501,6 +505,7 @@ 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 @@ -728,6 +733,7 @@ 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