From 140068b5148b8c88fad92f14dd8194c9137e470f Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 22 Apr 2020 10:26:15 +1000 Subject: [PATCH] func-tests: drop debuntu specific env vars These tests are used generically to build a range of images, not just debuntu based ones. Remove these platform specific flags. In the jobs based on this for the nodepool gate we are building centos images, so these don't apply there. Change-Id: Ia4dde1fb01da284a5e681237ab88c68fb9afcbef --- .../templates/nodepool.yaml.j2 | 5 ----- .../nodepool-functional-openstack/templates/nodepool.yaml.j2 | 5 ----- 2 files changed, 10 deletions(-) diff --git a/playbooks/nodepool-functional-container-openstack/templates/nodepool.yaml.j2 b/playbooks/nodepool-functional-container-openstack/templates/nodepool.yaml.j2 index 8992d9545..78131a446 100644 --- a/playbooks/nodepool-functional-container-openstack/templates/nodepool.yaml.j2 +++ b/playbooks/nodepool-functional-container-openstack/templates/nodepool.yaml.j2 @@ -64,15 +64,10 @@ diskimages: DIB_CHECKSUM: '1' DIB_SHOW_IMAGE_USAGE: '1' DIB_IMAGE_CACHE: '{{ NODEPOOL_DIB_BASE_PATH }}/cache' - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBIAN_COMPONENTS: 'main,universe' DIB_DEV_USER_AUTHORIZED_KEYS: '{{ NODEPOOL_PUBKEY }}' {% if 'mirror' in nodepool_diskimage %} DIB_DISTRIBUTION_MIRROR: '{{ nodepool_diskimage.mirror }}' {% endif %} - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - # TODO(corvus): cached $DIB_GET_PIP {% if zuul.projects.get('opendev.org/opendev/glean', {}).get('required', False) %} DIB_INSTALLTYPE_simple_init: 'repo' DIB_REPOLOCATION_glean: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/opendev/glean'].src_dir }}" diff --git a/playbooks/nodepool-functional-openstack/templates/nodepool.yaml.j2 b/playbooks/nodepool-functional-openstack/templates/nodepool.yaml.j2 index 8992d9545..78131a446 100644 --- a/playbooks/nodepool-functional-openstack/templates/nodepool.yaml.j2 +++ b/playbooks/nodepool-functional-openstack/templates/nodepool.yaml.j2 @@ -64,15 +64,10 @@ diskimages: DIB_CHECKSUM: '1' DIB_SHOW_IMAGE_USAGE: '1' DIB_IMAGE_CACHE: '{{ NODEPOOL_DIB_BASE_PATH }}/cache' - DIB_APT_LOCAL_CACHE: '0' - DIB_DISABLE_APT_CLEANUP: '1' - DIB_DEBIAN_COMPONENTS: 'main,universe' DIB_DEV_USER_AUTHORIZED_KEYS: '{{ NODEPOOL_PUBKEY }}' {% if 'mirror' in nodepool_diskimage %} DIB_DISTRIBUTION_MIRROR: '{{ nodepool_diskimage.mirror }}' {% endif %} - DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' - # TODO(corvus): cached $DIB_GET_PIP {% if zuul.projects.get('opendev.org/opendev/glean', {}).get('required', False) %} DIB_INSTALLTYPE_simple_init: 'repo' DIB_REPOLOCATION_glean: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/opendev/glean'].src_dir }}"