Skip to content

Commit e2ccd6f

Browse files
committed
[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 d9596fd)
1 parent 56f4fe3 commit e2ccd6f

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

zuul.d/tempest-multinode.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
vars:
4040
tox_envlist: integrated-network
4141
devstack_localrc:
42-
CIRROS_VERSION: 0.5.1
43-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
44-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
42+
CIRROS_VERSION: 0.5.2
43+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
44+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
4545
Q_ML2_TENANT_NETWORK_TYPE: vxlan
4646
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
4747
Q_AGENT: openvswitch
@@ -172,9 +172,9 @@
172172
vars:
173173
tox_envlist: integrated-network
174174
devstack_localrc:
175-
CIRROS_VERSION: 0.5.1
176-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
177-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
175+
CIRROS_VERSION: 0.5.2
176+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
177+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
178178
Q_ML2_TENANT_NETWORK_TYPE: vxlan
179179
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
180180
Q_AGENT: openvswitch
@@ -266,9 +266,9 @@
266266
devstack_plugins:
267267
neutron: https://opendev.org/openstack/neutron.git
268268
devstack_localrc:
269-
CIRROS_VERSION: 0.5.1
270-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
271-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
269+
CIRROS_VERSION: 0.5.2
270+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
271+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
272272
Q_ML2_TENANT_NETWORK_TYPE: vxlan
273273
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
274274
Q_AGENT: openvswitch
@@ -383,9 +383,9 @@
383383
ovn:
384384
enable_distributed_floating_ip: True
385385
devstack_localrc:
386-
CIRROS_VERSION: 0.5.1
387-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
388-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
386+
CIRROS_VERSION: 0.5.2
387+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
388+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
389389
Q_AGENT: ovn
390390
ML2_L3_PLUGIN: ovn-router,trunk
391391
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger

zuul.d/tempest-singlenode.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@
339339
neutron_plugin_options:
340340
is_igmp_snooping_enabled: True
341341
devstack_localrc:
342-
CIRROS_VERSION: 0.5.1
343-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
344-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
342+
CIRROS_VERSION: 0.5.2
343+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
344+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
345345
Q_AGENT: ovn
346346
ML2_L3_PLUGIN: ovn-router,trunk
347347
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
@@ -448,9 +448,9 @@
448448
vars:
449449
tox_envlist: integrated-network
450450
devstack_localrc:
451-
CIRROS_VERSION: 0.5.1
452-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
453-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
451+
CIRROS_VERSION: 0.5.2
452+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
453+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
454454
devstack_plugins:
455455
neutron: https://opendev.org/openstack/neutron.git
456456
devstack_services:

0 commit comments

Comments
 (0)