Merge "Use default cirros image to reap the benefits of infra cache"
This commit is contained in:
commit
6052eebfc8
10
.zuul.yaml
10
.zuul.yaml
|
@ -506,9 +506,7 @@
|
||||||
tempest_test_regex: ^neutron_tempest_plugin\.scenario
|
tempest_test_regex: ^neutron_tempest_plugin\.scenario
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
PHYSICAL_NETWORK: default
|
PHYSICAL_NETWORK: default
|
||||||
DOWNLOAD_DEFAULT_IMAGES: false
|
IMAGE_URLS: https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
|
||||||
IMAGE_URLS: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
|
|
||||||
DEFAULT_IMAGE_NAME: cirros-0.3.4-i386-disk
|
|
||||||
ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
|
ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
|
||||||
ADVANCED_INSTANCE_TYPE: ds512M
|
ADVANCED_INSTANCE_TYPE: ds512M
|
||||||
ADVANCED_INSTANCE_USER: ubuntu
|
ADVANCED_INSTANCE_USER: ubuntu
|
||||||
|
@ -848,9 +846,7 @@
|
||||||
USE_PYTHON3: true
|
USE_PYTHON3: true
|
||||||
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}"
|
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}"
|
||||||
PHYSICAL_NETWORK: default
|
PHYSICAL_NETWORK: default
|
||||||
DOWNLOAD_DEFAULT_IMAGES: false
|
IMAGE_URLS: https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
|
||||||
IMAGE_URLS: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
|
|
||||||
DEFAULT_IMAGE_NAME: cirros-0.3.4-i386-disk
|
|
||||||
ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
|
ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
|
||||||
ADVANCED_INSTANCE_TYPE: ds512M
|
ADVANCED_INSTANCE_TYPE: ds512M
|
||||||
ADVANCED_INSTANCE_USER: ubuntu
|
ADVANCED_INSTANCE_USER: ubuntu
|
||||||
|
@ -1044,8 +1040,6 @@
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
DESIGNATE_BACKEND_DRIVER: bind9
|
DESIGNATE_BACKEND_DRIVER: bind9
|
||||||
DOWNLOAD_DEFAULT_IMAGES: false
|
|
||||||
IMAGE_URLS: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,
|
|
||||||
Q_AGENT: openvswitch
|
Q_AGENT: openvswitch
|
||||||
# In this job advanced image is not needed, so it's name should be
|
# In this job advanced image is not needed, so it's name should be
|
||||||
# empty
|
# empty
|
||||||
|
|
Loading…
Reference in New Issue