From 209d363cce20d48d21455a196086a19f1d0d97e1 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Tue, 3 Oct 2023 20:10:44 +0530 Subject: [PATCH] Temporary turn off l3_ha in ovs/lb master/bobcat jobs Tests fails randomly with l3_ha in openvswitch and linuxbridge master and stable/2023.2 jobs, until the issue is fixed let's turn off l3_ha temporary. Related-Bug: #2037239 Change-Id: Ia23b39819834e2bc12ec7113bb841007f7cf1ff5 --- zuul.d/2023_1_jobs.yaml | 12 ++++++++++++ zuul.d/master_jobs.yaml | 9 ++++++--- zuul.d/train_jobs.yaml | 9 +++++++++ zuul.d/ussuri_jobs.yaml | 9 +++++++++ zuul.d/victoria_jobs.yaml | 12 ++++++++++++ zuul.d/wallaby_jobs.yaml | 12 ++++++++++++ zuul.d/xena_jobs.yaml | 12 ++++++++++++ zuul.d/yoga_jobs.yaml | 12 ++++++++++++ zuul.d/zed_jobs.yaml | 12 ++++++++++++ 9 files changed, 96 insertions(+), 3 deletions(-) diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml index b9f293fe..e521c018 100644 --- a/zuul.d/2023_1_jobs.yaml +++ b/zuul.d/2023_1_jobs.yaml @@ -96,6 +96,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -130,6 +134,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -187,6 +195,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_linuxbridge) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml index 97b57596..49098dc8 100644 --- a/zuul.d/master_jobs.yaml +++ b/zuul.d/master_jobs.yaml @@ -255,7 +255,8 @@ $NEUTRON_CONF: DEFAULT: enable_dvr: false - l3_ha: true + # TODO(ykarel) Turn on once https://bugs.launchpad.net/neutron/+bug/2037239 fixed + l3_ha: false /$NEUTRON_CORE_PLUGIN_CONF: agent: tunnel_types: vxlan,gre @@ -354,7 +355,8 @@ $NEUTRON_CONF: DEFAULT: enable_dvr: false - l3_ha: true + # TODO(ykarel) Turn on once https://bugs.launchpad.net/neutron/+bug/2037239 fixed + l3_ha: false /$NEUTRON_CORE_PLUGIN_CONF: agent: tunnel_types: vxlan,gre @@ -524,7 +526,8 @@ DEFAULT: enable_dvr: false vlan_transparent: true - l3_ha: true + # TODO(ykarel) Turn on once https://bugs.launchpad.net/neutron/+bug/2037239 fixed + l3_ha: false AGENT: debug_iptables_rules: true EXPERIMENTAL: diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml index 159feb29..5b1d354b 100644 --- a/zuul.d/train_jobs.yaml +++ b/zuul.d/train_jobs.yaml @@ -154,6 +154,9 @@ DEFAULT: # NOTE(slaweq): on Bionic keepalived doesn't knows this option yet keepalived_use_no_track: False + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -188,6 +191,9 @@ DEFAULT: # NOTE(slaweq): on Bionic keepalived don't knows this option yet keepalived_use_no_track: False + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -222,6 +228,9 @@ DEFAULT: # NOTE(slaweq): on Bionic keepalived don't knows this option yet keepalived_use_no_track: False + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml index 5abc7419..81da9af2 100644 --- a/zuul.d/ussuri_jobs.yaml +++ b/zuul.d/ussuri_jobs.yaml @@ -159,6 +159,9 @@ DEFAULT: # NOTE(slaweq): on Bionic keepalived don't knows this option yet keepalived_use_no_track: False + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -191,6 +194,9 @@ DEFAULT: # NOTE(slaweq): on Bionic keepalived don't knows this option yet keepalived_use_no_track: False + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -218,6 +224,9 @@ DEFAULT: # NOTE(slaweq): on Bionic keepalived don't knows this option yet keepalived_use_no_track: False + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml index 1f611db8..ca5ae6ba 100644 --- a/zuul.d/victoria_jobs.yaml +++ b/zuul.d/victoria_jobs.yaml @@ -152,6 +152,10 @@ ADVANCED_INSTANCE_USER: ubuntu CUSTOMIZE_IMAGE: false devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -184,6 +188,10 @@ ADVANCED_INSTANCE_USER: ubuntu CUSTOMIZE_IMAGE: false devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -212,6 +220,10 @@ ADVANCED_INSTANCE_USER: ubuntu CUSTOMIZE_IMAGE: false devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml index 92a3e508..c40ec370 100644 --- a/zuul.d/wallaby_jobs.yaml +++ b/zuul.d/wallaby_jobs.yaml @@ -110,6 +110,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -137,6 +141,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -157,6 +165,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml index 25d63a9a..3c86d531 100644 --- a/zuul.d/xena_jobs.yaml +++ b/zuul.d/xena_jobs.yaml @@ -112,6 +112,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -132,6 +136,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -152,6 +160,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml index 04c9ddd1..76a24fcb 100644 --- a/zuul.d/yoga_jobs.yaml +++ b/zuul.d/yoga_jobs.yaml @@ -109,6 +109,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_openvswitch) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -129,6 +133,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_openvswitch) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -149,6 +157,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml index 8c70a66d..1318586c 100644 --- a/zuul.d/zed_jobs.yaml +++ b/zuul.d/zed_jobs.yaml @@ -98,6 +98,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -132,6 +136,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: @@ -160,6 +168,10 @@ devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_linuxbridge) | join(',') }}" devstack_local_conf: + post-config: + $NEUTRON_CONF: + DEFAULT: + l3_ha: true test-config: $TEMPEST_CONFIG: network-feature-enabled: