From 0910d49e3e231e52fc956afaafcc2ed329ad8191 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Thu, 26 Aug 2021 08:52:40 +0000 Subject: [PATCH] Use default "ds512M" advance image in older stable branches Those branches are not affected by the related bug. Furthermore, those branches override the neutron-tempest-plugin version with an older one that does not implement the method "create_flavor_for_advance_image". This method is used to create a specific flavor used in the CI tests. Change-Id: Iad6fdfb3ebe7b5cafd8a1ee00724408abd7c17ff Related-Bug: #1940243 --- zuul.d/queens_jobs.yaml | 2 ++ zuul.d/rocky_jobs.yaml | 6 ++++++ zuul.d/stein_jobs.yaml | 3 +++ zuul.d/train_jobs.yaml | 3 +++ 4 files changed, 14 insertions(+) diff --git a/zuul.d/queens_jobs.yaml b/zuul.d/queens_jobs.yaml index 97015485..b3e521b2 100644 --- a/zuul.d/queens_jobs.yaml +++ b/zuul.d/queens_jobs.yaml @@ -141,6 +141,7 @@ CIRROS_VERSION: 0.3.5 NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin + ADVANCED_INSTANCE_TYPE: ds512M - job: name: neutron-tempest-plugin-scenario-linuxbridge-queens @@ -169,6 +170,7 @@ Q_AGENT: linuxbridge NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_CONF: diff --git a/zuul.d/rocky_jobs.yaml b/zuul.d/rocky_jobs.yaml index 47f88f2f..211e8967 100644 --- a/zuul.d/rocky_jobs.yaml +++ b/zuul.d/rocky_jobs.yaml @@ -167,6 +167,7 @@ Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_CONF: @@ -226,6 +227,7 @@ <<: *scenario_vars_rocky devstack_localrc: USE_PYTHON3: True + ADVANCED_INSTANCE_TYPE: ds512M branches: ^(?!stable/rocky).*$ irrelevant-files: *openvswitch-scenario-irrelevant-files @@ -263,6 +265,7 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_CONF: @@ -330,6 +333,7 @@ <<: *openvswitch_vars_rocky devstack_localrc: USE_PYTHON3: True + ADVANCED_INSTANCE_TYPE: ds512M branches: ^(?!stable/rocky).*$ irrelevant-files: *iptables_hybrid_irrelevant_files @@ -352,6 +356,7 @@ Q_AGENT: linuxbridge NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_CONF: @@ -403,6 +408,7 @@ Q_AGENT: linuxbridge NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin + ADVANCED_INSTANCE_TYPE: ds512M branches: ^(?!stable/rocky).*$ - job: diff --git a/zuul.d/stein_jobs.yaml b/zuul.d/stein_jobs.yaml index 40bca7cf..037bba2a 100644 --- a/zuul.d/stein_jobs.yaml +++ b/zuul.d/stein_jobs.yaml @@ -130,6 +130,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_L3_CONF: @@ -177,6 +178,7 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_CONF: @@ -263,6 +265,7 @@ NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_linuxbridge) | join(',') }}" Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_CONF: diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml index a623251a..a7ac8bf6 100644 --- a/zuul.d/train_jobs.yaml +++ b/zuul.d/train_jobs.yaml @@ -135,6 +135,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_L3_CONF: @@ -160,6 +161,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_L3_CONF: @@ -185,6 +187,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + ADVANCED_INSTANCE_TYPE: ds512M devstack_local_conf: post-config: $NEUTRON_L3_CONF: