openstack/neutron
Code Issues Proposed changes

Merge "Revert "Disable mysql gather performance in jobs""

Browse Source
This commit is contained in:
Zuul 2024-01-15 10:24:49 +00:00 committed by Gerrit Code Review
commit a921d14d9a
4 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zuul.d/grenade.yaml
View File

@ -40,7 +40,6 @@
vars: vars:
grenade_devstack_localrc: grenade_devstack_localrc:
shared: shared:
MYSQL_GATHER_PERFORMANCE: false
Q_AGENT: openvswitch Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
@ -118,7 +117,6 @@
vars: vars:
grenade_devstack_localrc: grenade_devstack_localrc:
shared: shared:
MYSQL_GATHER_PERFORMANCE: false
Q_AGENT: openvswitch Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
@ -280,7 +278,6 @@
Q_BUILD_OVS_FROM_GIT: false Q_BUILD_OVS_FROM_GIT: false
OVN_BUILD_MODULES: false OVN_BUILD_MODULES: false
shared: shared:
MYSQL_GATHER_PERFORMANCE: false
Q_AGENT: ovn Q_AGENT: ovn
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
Q_ML2_TENANT_NETWORK_TYPE: geneve Q_ML2_TENANT_NETWORK_TYPE: geneve

2
zuul.d/rally.yaml
View File

@ -4,7 +4,6 @@
timeout: 10800 timeout: 10800
vars: vars:
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
USE_PYTHON3: true USE_PYTHON3: true
OSPROFILER_COLLECTOR: redis OSPROFILER_COLLECTOR: redis
OSPROFILER_HMAC_KEYS: "neutron-hmac-key-used-in-zuul-ci" OSPROFILER_HMAC_KEYS: "neutron-hmac-key-used-in-zuul-ci"
@ -163,7 +162,6 @@
s-object: false s-object: false
s-proxy: false s-proxy: false
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
Q_AGENT: ovn Q_AGENT: ovn
ML2_L3_PLUGIN: ovn-router,trunk ML2_L3_PLUGIN: ovn-router,trunk
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger

5
zuul.d/tempest-multinode.yaml
View File

@ -79,7 +79,6 @@
vars: vars:
tox_envlist: integrated-network tox_envlist: integrated-network
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
CIRROS_VERSION: 0.6.2 CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
@ -207,7 +206,6 @@
vars: vars:
tox_envlist: integrated-network tox_envlist: integrated-network
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
CIRROS_VERSION: 0.6.2 CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
@ -297,7 +295,6 @@
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git neutron: https://opendev.org/openstack/neutron.git
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
CIRROS_VERSION: 0.6.2 CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
@ -427,7 +424,6 @@
ovn: ovn:
enable_distributed_floating_ip: True enable_distributed_floating_ip: True
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
CIRROS_VERSION: 0.6.2 CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
@ -572,7 +568,6 @@
'{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs' '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
'{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs' '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
OVN_BUILD_FROM_SOURCE: True OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: main OVN_BRANCH: main
# NOTE(ykarel): OVN main branch following OVS stable branch # NOTE(ykarel): OVN main branch following OVS stable branch

6
zuul.d/tempest-singlenode.yaml
View File

@ -11,7 +11,6 @@
vars: vars:
tempest_concurrency: 4 tempest_concurrency: 4
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_TENANT_NETWORK_TYPE: vxlan
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
devstack_plugins: devstack_plugins:
@ -53,7 +52,6 @@
parent: neutron-tempest-base parent: neutron-tempest-base
vars: vars:
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
Q_AGENT: openvswitch Q_AGENT: openvswitch
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
irrelevant-files: &openvswitch-irrelevant-files irrelevant-files: &openvswitch-irrelevant-files
@ -268,7 +266,6 @@
- openstack/tempest - openstack/tempest
vars: vars:
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
MYSQL_SERVICE_NAME: mariadb MYSQL_SERVICE_NAME: mariadb
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
devstack_plugins: devstack_plugins:
@ -427,7 +424,6 @@
timeout: 10800 timeout: 10800
vars: vars:
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
# TODO(ykarel) can be enabled once # TODO(ykarel) can be enabled once
# https://bugs.launchpad.net/neutron/+bug/1912359 fixed # https://bugs.launchpad.net/neutron/+bug/1912359 fixed
NEUTRON_DEPLOY_MOD_WSGI: false NEUTRON_DEPLOY_MOD_WSGI: false
@ -505,7 +501,6 @@
DEFAULT: DEFAULT:
rpc_workers: 0 rpc_workers: 0
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
CIRROS_VERSION: 0.6.2 CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
@ -732,7 +727,6 @@
vars: vars:
tox_envlist: integrated-network tox_envlist: integrated-network
devstack_localrc: devstack_localrc:
MYSQL_GATHER_PERFORMANCE: false
MYSQL_REDUCE_MEMORY: true MYSQL_REDUCE_MEMORY: true
CIRROS_VERSION: 0.6.2 CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec