openstack/neutron
Code Issues Proposed changes

[stable-only] Replace cirros image versions not cached in the CI

Browse Source 
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 d9596fd18f)
This commit is contained in:
Rodolfo Alonso Hernandez
2023-10-14 23:39:47 +00:00
parent 78d8091543
commit 6ab5cbcd93
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zuul.d/tempest-multinode.yaml
View File

@@ -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

12
zuul.d/tempest-singlenode.yaml
View File

@@ -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: