From ceafa6623151ded31081eec7f13d3851d3b83d83 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Tue, 11 Feb 2025 08:06:07 +0000 Subject: [PATCH] [eventlet-removal] Remove "logger" mechanism from ML2/OVN CI jobs The "logger" mechanism is a testing class that is still calling monkey_patch. This mechanism driver is not relevant nor neccessary for the ML2/OVN CI jobs. Depends-On: https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/941212 Change-Id: I93b8f1953b23aa80b69c95d16eaad38b0342e013 --- zuul.d/grenade.yaml | 10 ++++++++-- zuul.d/rally.yaml | 5 ++++- zuul.d/tempest-multinode.yaml | 10 ++++++++-- zuul.d/tempest-singlenode.yaml | 5 ++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index c62a24d078e..746b94f55a9 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -293,7 +293,10 @@ OVN_BUILD_MODULES: false shared: Q_AGENT: ovn - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + # NOTE(ralonsoh): during the eventlet removal, the "logger" mech + # driver has been removed from this list. Re-add it once the removal + # is finished or the mech driver does not call monkey_patch(). + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn Q_ML2_TENANT_NETWORK_TYPE: geneve Q_USE_PROVIDERNET_FOR_PUBLIC: true PHYSICAL_NETWORK: public @@ -382,7 +385,10 @@ OVN_BUILD_MODULES: false shared: Q_AGENT: ovn - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + # NOTE(ralonsoh): during the eventlet removal, the "logger" mech + # driver has been removed from this list. Re-add it once the removal + # is finished or the mech driver does not call monkey_patch(). + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn Q_ML2_TENANT_NETWORK_TYPE: geneve Q_USE_PROVIDERNET_FOR_PUBLIC: true PHYSICAL_NETWORK: public diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml index 6d8a690da10..993b71ec78c 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -171,7 +171,10 @@ devstack_localrc: Q_AGENT: ovn ML2_L3_PLUGIN: ovn-router,trunk - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + # NOTE(ralonsoh): during the eventlet removal, the "logger" mech + # driver has been removed from this list. Re-add it once the removal + # is finished or the mech driver does not call monkey_patch(). + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn Q_ML2_TENANT_NETWORK_TYPE: geneve USE_PYTHON3: true PHYSICAL_NETWORK: public diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 8854c6268a7..6daaeeefda0 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -439,7 +439,10 @@ DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz Q_AGENT: ovn ML2_L3_PLUGIN: ovn-router,trunk - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + # NOTE(ralonsoh): during the eventlet removal, the "logger" mech + # driver has been removed from this list. Re-add it once the removal + # is finished or the mech driver does not call monkey_patch(). + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn Q_ML2_TENANT_NETWORK_TYPE: geneve Q_USE_PROVIDERNET_FOR_PUBLIC: true PHYSICAL_NETWORK: public @@ -518,7 +521,10 @@ c-vol: false devstack_localrc: Q_AGENT: ovn - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + # NOTE(ralonsoh): during the eventlet removal, the "logger" mech + # driver has been removed from this list. Re-add it once the removal + # is finished or the mech driver does not call monkey_patch(). + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn Q_ML2_TENANT_NETWORK_TYPE: geneve Q_USE_PROVIDERNET_FOR_PUBLIC: true PHYSICAL_NETWORK: public diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 7c4dfff538c..425e0db82c0 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -463,7 +463,10 @@ DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz Q_AGENT: ovn ML2_L3_PLUGIN: ovn-router,trunk - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + # NOTE(ralonsoh): during the eventlet removal, the "logger" mech + # driver has been removed from this list. Re-add it once the removal + # is finished or the mech driver does not call monkey_patch(). + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve Q_ML2_TENANT_NETWORK_TYPE: geneve Q_USE_PROVIDERNET_FOR_PUBLIC: true