commit 35a4414fcf72dbc7255c7bdb104c6c07cec8f44f
Author: Slawek Kaplonski <skaplons@redhat.com>
Date:   Tue Sep 29 21:39:53 2020 +0200

    Use Cirros 0.5.1 in scenario jobs for all branches
    
    Cirros 0.5.1 has got improvements for getting data from the
    metadata service, see [1] for details.
    It is used by default in Devstack since Victoria but this patch
    defines to download this version of Cirros for all
    neutron-tempest-plugin jobs so it will be used also in our
    jobs for stable branches.
    That should improve our tests reliability as we should see
    less Authentication Error while SSHing to the guet vm.
    
    It also should cause any problems as our tests don't rely really
    on any specific features of the older Cirros.
    
    This patch additionally updates also advanced image to be
    Ubuntu 18.04 where it wasn't changed yet.
    
    [1] https://github.com/cirros-dev/cirros/pull/11/commits/e40bcd2964aa496a9d03e1aaf95cf7a86938f129
    
    Change-Id: I18107d7169b164dfddd1cffb71dffccf2a3ba206

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index ddf7dc6..77947fa 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -17,6 +17,8 @@
       devstack_localrc:
         USE_PYTHON3: true
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
+        CIRROS_VERSION: 0.5.1
+        BUILD_TIMEOUT: 784
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git
@@ -100,6 +102,7 @@
       tempest_test_regex: ^neutron_tempest_plugin\.scenario
       devstack_localrc:
         PHYSICAL_NETWORK: default
+        CIRROS_VERSION: 0.5.1
         IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
         ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
         ADVANCED_INSTANCE_TYPE: ds512M
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 5607274..71dfcb2 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -271,8 +271,9 @@
         USE_PYTHON3: true
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}"
         PHYSICAL_NETWORK: default
-        IMAGE_URLS: https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
-        ADVANCED_IMAGE_NAME: ubuntu-16.04-server-cloudimg-amd64-disk1
+        CIRROS_VERSION: 0.5.1
+        IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
+        ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
         ADVANCED_INSTANCE_TYPE: ds512M
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784