openstack
/
neutron-tempest-plugin
Code Issues Proposed changes

Merge "Update Cirros image to 0.6.2"

This commit is contained in:
Zuul 2023-08-17 20:08:58 +00:00 committed by Gerrit Code Review
parent d84b96d294 1f5797e733
commit 010ed337eb
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zuul.d/base-nested-switch.yaml
View File

@ -29,11 +29,10 @@
vars: &nested_virt_vars
devstack_localrc:
LIBVIRT_TYPE: kvm
# cirros 0.6.1 not booting when host-passthrough is used
# LIBVIRT_CPU_MODE: host-passthrough
CIRROS_VERSION: 0.6.1
DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-disk
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.1-x86_64-disk.img
LIBVIRT_CPU_MODE: host-passthrough
CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-disk
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-disk.img
# Base nested switch job for yoga and zed
- job:

12
zuul.d/master_jobs.yaml
View File

@ -27,9 +27,9 @@
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
PHYSICAL_NETWORK: public
IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
CIRROS_VERSION: 0.6.1
DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.1-x86_64-uec.tar.gz
CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz
ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
ADVANCED_INSTANCE_TYPE: ntp_image_256M
ADVANCED_INSTANCE_USER: ubuntu
@ -752,9 +752,9 @@
USE_PYTHON3: true
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}"
PHYSICAL_NETWORK: default
CIRROS_VERSION: 0.6.1
DEFAULT_IMAGE_NAME: cirros-0.6.1-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.1-x86_64-uec.tar.gz
CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz
IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
ADVANCED_INSTANCE_TYPE: ntp_image_256M