From 99d5a8d219243448121ef00a09bcb0cb830ba59c Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 24 Apr 2020 12:34:59 +1000
Subject: [PATCH] Fix args to debuntu functional tests

Ia4dde1fb01da284a5e681237ab88c68fb9afcbef dropped these from the
generic job in nodepool, because they shouldn't apply to other distros
using the job like CentOS etc.  Add the required args back here to the
debuntu tests.

Change-Id: I3f9ae58f3aa534d65344d79d44b0b74368e329a8
---
 .zuul.d/jobs.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 7aee5600..a5d9b7f0 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -274,6 +274,10 @@
         base_element: ubuntu-minimal
         release: 'xenial'
         mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu"
+        env-vars:
+          DIB_APT_LOCAL_CACHE: '0'
+          DIB_DISABLE_APT_CLEANUP: '1'
+          DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
 
 - job:
     name: dib-nodepool-functional-openstack-ubuntu-bionic
@@ -290,6 +294,10 @@
         base_element: ubuntu-minimal
         release: 'bionic'
         mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu"
+        env-vars:
+          DIB_APT_LOCAL_CACHE: '0'
+          DIB_DISABLE_APT_CLEANUP: '1'
+          DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
 
 - job:
     name: dib-nodepool-functional-openstack-ubuntu-bionic-src
@@ -305,6 +313,10 @@
         base_element: ubuntu-minimal
         release: 'bionic'
         mirror: "http://{{ zuul_site_mirror_fqdn }}/ubuntu"
+        env-vars:
+          DIB_APT_LOCAL_CACHE: '0'
+          DIB_DISABLE_APT_CLEANUP: '1'
+          DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
 
 - job:
     name: dib-nodepool-functional-openstack-gentoo-src
@@ -332,6 +344,10 @@
         base_element: debian-minimal
         release: 'stretch'
         mirror: "http://{{ zuul_site_mirror_fqdn }}/debian"
+        env-vars:
+          DIB_APT_LOCAL_CACHE: '0'
+          DIB_DISABLE_APT_CLEANUP: '1'
+          DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
 
 - job:
     name: dib-nodepool-functional-openstack-debian-buster-src
@@ -347,6 +363,10 @@
         base_element: debian-minimal
         release: 'buster'
         mirror: "http://{{ zuul_site_mirror_fqdn }}/debian"
+        env-vars:
+          DIB_APT_LOCAL_CACHE: '0'
+          DIB_DISABLE_APT_CLEANUP: '1'
+          DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
 
 - job:
     name: dib-nodepool-functional-openstack-opensuse-15-src