Skip to content

Commit af6726e

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "[stable-only] Replace cirros image versions not cached in the CI" into stable/zed
2 parents 717eb38 + d9596fd commit af6726e

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
@@ -41,9 +41,9 @@
4141
vars:
4242
tox_envlist: integrated-network
4343
devstack_localrc:
44-
CIRROS_VERSION: 0.5.1
45-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
46-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
44+
CIRROS_VERSION: 0.5.2
45+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
46+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
4747
Q_ML2_TENANT_NETWORK_TYPE: vxlan
4848
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
4949
Q_AGENT: openvswitch
@@ -168,9 +168,9 @@
168168
vars:
169169
tox_envlist: integrated-network
170170
devstack_localrc:
171-
CIRROS_VERSION: 0.5.1
172-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
173-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
171+
CIRROS_VERSION: 0.5.2
172+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
173+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
174174
Q_ML2_TENANT_NETWORK_TYPE: vxlan
175175
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
176176
Q_AGENT: openvswitch
@@ -256,9 +256,9 @@
256256
devstack_plugins:
257257
neutron: https://opendev.org/openstack/neutron.git
258258
devstack_localrc:
259-
CIRROS_VERSION: 0.5.1
260-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
261-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
259+
CIRROS_VERSION: 0.5.2
260+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
261+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
262262
Q_ML2_TENANT_NETWORK_TYPE: vxlan
263263
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
264264
Q_AGENT: openvswitch
@@ -375,9 +375,9 @@
375375
ovn:
376376
enable_distributed_floating_ip: True
377377
devstack_localrc:
378-
CIRROS_VERSION: 0.5.1
379-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
380-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
378+
CIRROS_VERSION: 0.5.2
379+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
380+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
381381
Q_AGENT: ovn
382382
ML2_L3_PLUGIN: ovn-router,trunk
383383
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
@@ -347,9 +347,9 @@
347347
neutron_plugin_options:
348348
is_igmp_snooping_enabled: True
349349
devstack_localrc:
350-
CIRROS_VERSION: 0.5.1
351-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
352-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
350+
CIRROS_VERSION: 0.5.2
351+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
352+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
353353
Q_AGENT: ovn
354354
ML2_L3_PLUGIN: ovn-router,trunk
355355
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
@@ -458,9 +458,9 @@
458458
vars:
459459
tox_envlist: integrated-network
460460
devstack_localrc:
461-
CIRROS_VERSION: 0.5.1
462-
DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec
463-
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz
461+
CIRROS_VERSION: 0.5.2
462+
DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-uec
463+
DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-uec.tar.gz
464464
devstack_plugins:
465465
neutron: https://opendev.org/openstack/neutron.git
466466
devstack_services:

0 commit comments

Comments
 (0)