openstack/neutron
Code Issues Proposed changes

Merge "[stable-only] Replace cirros image versions not cached in the CI" into stable/yoga

Browse Source
This commit is contained in:
Zuul
2023-10-19 13:35:54 +00:00
committed by Gerrit Code Review
parent df5cb326ed e2ccd6f3d2
commit 9200a6ba2c
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
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

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

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