From 0f987ca4b61500b2023065e7cb43e5d5726b6847 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 27 Oct 2021 11:00:49 +1100
Subject: [PATCH] tests: remove debootstrap install

This is not needed on the host any more; it's part of the
nodepool-builder container.

Change-Id: I56564d58fe6193c21294aacbf9f769bba2142ec7
---
 .zuul.d/jobs.yaml                       | 7 -------
 playbooks/dib-nodepool/debootstrap.yaml | 9 ---------
 2 files changed, 16 deletions(-)
 delete mode 100644 playbooks/dib-nodepool/debootstrap.yaml

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index b7d97ecc..4204741a 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -106,7 +106,6 @@
       containerfile with Nodepool and OpenStack (using released
       libraries)
     parent: dib-nodepool-functional-src-base
-    pre-run: playbooks/dib-nodepool/debootstrap.yaml
     vars:
       nodepool_debug: true
       nodepool_diskimage:
@@ -119,7 +118,6 @@
       Test building and booting an Ubuntu xenial image with Nodepool
       and OpenStack
     parent: dib-nodepool-functional-src-base
-    pre-run: playbooks/dib-nodepool/debootstrap.yaml
     vars:
       nodepool_diskimage:
         base_element: ubuntu-minimal
@@ -136,7 +134,6 @@
       Test building and booting an Ubuntu bionic image with Nodepool
       and OpenStack
     parent: dib-nodepool-functional-src-base
-    pre-run: playbooks/dib-nodepool/debootstrap.yaml
     vars:
       nodepool_diskimage:
         base_element: ubuntu-minimal
@@ -153,7 +150,6 @@
       Test building and booting an Ubuntu focal image with Nodepool
       and OpenStack
     parent: dib-nodepool-functional-src-base
-    pre-run: playbooks/dib-nodepool/debootstrap.yaml
     vars:
       nodepool_diskimage:
         base_element: ubuntu-minimal
@@ -182,7 +178,6 @@
       Test building and booting a Debian stretch image with Nodepool
       and OpenStack
     parent: dib-nodepool-functional-src-base
-    pre-run: playbooks/dib-nodepool/debootstrap.yaml
     vars:
       nodepool_diskimage:
         base_element: debian-minimal
@@ -199,7 +194,6 @@
       Test building and booting a Debian bullseye image with Nodepool
       and OpenStack
     parent: dib-nodepool-functional-src-base
-    pre-run: playbooks/dib-nodepool/debootstrap.yaml
     vars:
       nodepool_diskimage:
         base_element: debian-minimal
@@ -216,7 +210,6 @@
       Test building and booting a Debian buster image with Nodepool
       and OpenStack
     parent: dib-nodepool-functional-src-base
-    pre-run: playbooks/dib-nodepool/debootstrap.yaml
     vars:
       nodepool_diskimage:
         base_element: debian-minimal
diff --git a/playbooks/dib-nodepool/debootstrap.yaml b/playbooks/dib-nodepool/debootstrap.yaml
deleted file mode 100644
index c83e13e7..00000000
--- a/playbooks/dib-nodepool/debootstrap.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: all
-  tasks:
-    # We need a fixed debootstrap
-    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901977
-    - name: Install updated debootstrap repo
-      become: true
-      shell: |
-        add-apt-repository ppa:openstack-ci-core/debootstrap
-        apt-get update