From 497cd55031d3d0528388480ef3f21af94e92f885 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Mon, 2 Dec 2024 18:31:32 +0530 Subject: [PATCH] Bump cirros version to 0.6.3 0.6.3 includes some fixes, let's use it. devstack already switched to it with [1]. [1] https://review.opendev.org/c/openstack/devstack/+/930647 Related-Bug: #2045549 Change-Id: I179b0dfd399c35fad2bb44bdd6f553b773629fec --- zuul.d/tempest-multinode.yaml | 24 +++++++++---------- zuul.d/tempest-singlenode.yaml | 42 +++++++++++++++++----------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 9ae8056dd07..f6f69cb5b93 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -86,9 +86,9 @@ tox_envlist: integrated-network devstack_localrc: MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge Q_AGENT: openvswitch @@ -214,9 +214,9 @@ tox_envlist: integrated-network devstack_localrc: MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch Q_AGENT: openvswitch @@ -304,9 +304,9 @@ neutron: https://opendev.org/openstack/neutron.git devstack_localrc: MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch Q_AGENT: openvswitch @@ -440,9 +440,9 @@ enable_distributed_floating_ip: True devstack_localrc: MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + 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 diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 684013afb40..c953aa5b1a0 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -13,9 +13,9 @@ devstack_localrc: Q_ML2_TENANT_NETWORK_TYPE: vxlan MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: neutron: https://opendev.org/openstack/neutron.git @@ -233,9 +233,9 @@ devstack_localrc: MYSQL_SERVICE_NAME: mariadb MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: neutron: https://opendev.org/openstack/neutron.git @@ -354,9 +354,9 @@ - openstack/neutron-lib vars: devstack_localrc: - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: neutron: https://opendev.org/openstack/neutron.git @@ -431,9 +431,9 @@ vars: devstack_localrc: MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: neutron: https://opendev.org/openstack/neutron.git @@ -516,9 +516,9 @@ rpc_workers: 0 devstack_localrc: MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + 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 @@ -779,9 +779,9 @@ tox_envlist: integrated-network devstack_localrc: MYSQL_REDUCE_MEMORY: true - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: neutron: https://opendev.org/openstack/neutron.git @@ -848,9 +848,9 @@ override-checkout: main vars: devstack_localrc: - CIRROS_VERSION: 0.6.2 - DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz + CIRROS_VERSION: 0.6.3 + DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: neutron: https://opendev.org/openstack/neutron.git