From 6ab5cbcd935d120aac760f0764490b77b0c951d4 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Sat, 14 Oct 2023 23:39:47 +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 Conflicts: zuul.d/tempest-multinode.yaml 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 9706588b91b..05e081c3078 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 devstack_services: br-ex-tcpdump: true br-int-flows: true @@ -139,9 +139,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: @@ -179,9 +179,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 devstack_services: br-ex-tcpdump: true br-int-flows: true @@ -259,9 +259,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 b5171b9bbaf..022f004ee13 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -307,9 +307,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 @@ -414,9 +414,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: