From e2ccd6f3d23ead6c6c64f28918d75d7c6dec43f3 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Sat, 14 Oct 2023 23:32:48 +0000 Subject: [PATCH] [stable-only] Replace cirros image versions not cached in the CI Since [1], some cirros images have been deleted from the CI cache. It could happen that using cirros images not cached, that implies to download them, could fail. Any version not cached should be replaced by its closer image version. [1]https://review.opendev.org/c/openstack/project-config/+/873735 Related-Bug: #2039586 Change-Id: I683b822becee6b2828eeed04a87d573caa9a76aa (cherry picked from commit d9596fd18f0f22d46c1b7414cd0e5b5818aa347b) --- zuul.d/tempest-multinode.yaml | 24 ++++++++++++------------ zuul.d/tempest-singlenode.yaml | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index e86e1e67b79..a773663d001 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -39,9 +39,9 @@ vars: tox_envlist: integrated-network devstack_localrc: - CIRROS_VERSION: 0.5.1 - DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz + CIRROS_VERSION: 0.5.2 + DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge Q_AGENT: openvswitch @@ -172,9 +172,9 @@ vars: tox_envlist: integrated-network devstack_localrc: - CIRROS_VERSION: 0.5.1 - DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz + CIRROS_VERSION: 0.5.2 + DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge Q_AGENT: openvswitch @@ -266,9 +266,9 @@ devstack_plugins: neutron: https://opendev.org/openstack/neutron.git devstack_localrc: - CIRROS_VERSION: 0.5.1 - DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz + CIRROS_VERSION: 0.5.2 + DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge Q_AGENT: openvswitch @@ -383,9 +383,9 @@ ovn: enable_distributed_floating_ip: True devstack_localrc: - CIRROS_VERSION: 0.5.1 - DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz + CIRROS_VERSION: 0.5.2 + DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-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 de371cc1f12..709879e6bc3 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -339,9 +339,9 @@ neutron_plugin_options: is_igmp_snooping_enabled: True devstack_localrc: - CIRROS_VERSION: 0.5.1 - DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz + CIRROS_VERSION: 0.5.2 + DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz Q_AGENT: ovn ML2_L3_PLUGIN: ovn-router,trunk Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger @@ -448,9 +448,9 @@ vars: tox_envlist: integrated-network devstack_localrc: - CIRROS_VERSION: 0.5.1 - DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec - DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz + CIRROS_VERSION: 0.5.2 + DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec + DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz devstack_plugins: neutron: https://opendev.org/openstack/neutron.git devstack_services: