From 27f057c2fdf19f4c08ef5e3f142761a1b3cab8f2 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 26 Oct 2021 17:45:39 +0200 Subject: [PATCH] [stable/{train,stein}] Use old guest image for these branches Customization of Ubuntu minimal guest images fails with missing guestmount binary, switch back to the previous guest image in these EM branches Change-Id: I98e53ac95b1c407149993ee93fe9eb36a23f0615 Closes-Bug: #1948804 --- zuul.d/stein_jobs.yaml | 20 ++++++++++++++++++++ zuul.d/train_jobs.yaml | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/zuul.d/stein_jobs.yaml b/zuul.d/stein_jobs.yaml index 676e0e14b..e38b0285a 100644 --- a/zuul.d/stein_jobs.yaml +++ b/zuul.d/stein_jobs.yaml @@ -136,7 +136,12 @@ tempest_black_regex: "(^neutron_tempest_plugin.scenario.test_port_forwardings.PortForwardingTestJSON.test_port_forwarding_to_2_servers)" devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false devstack_local_conf: post-config: $NEUTRON_L3_CONF: @@ -188,7 +193,12 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false devstack_local_conf: post-config: $NEUTRON_CONF: @@ -275,7 +285,12 @@ NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_linuxbridge) | join(',') }}" Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false devstack_local_conf: post-config: $NEUTRON_CONF: @@ -349,4 +364,9 @@ branch_override: stable/stein network_api_extensions_common: *api_extensions devstack_localrc: + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml index 5caf1273e..5e714a709 100644 --- a/zuul.d/train_jobs.yaml +++ b/zuul.d/train_jobs.yaml @@ -135,7 +135,12 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false devstack_local_conf: post-config: $NEUTRON_L3_CONF: @@ -161,7 +166,12 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false devstack_local_conf: post-config: $NEUTRON_L3_CONF: @@ -187,7 +197,12 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false devstack_local_conf: post-config: $NEUTRON_L3_CONF: @@ -221,7 +236,12 @@ branch_override: stable/train network_api_extensions_common: *api_extensions devstack_localrc: + # NOTE(bcafarel) guestmount binary not available on host OS + 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 + CUSTOMIZE_IMAGE: false - job: name: neutron-tempest-plugin-sfc-train