From 82eb1ca837a5df70776165a95ea9732079adda1e Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 18 May 2018 14:54:02 +1000
Subject: [PATCH] Replace the ubuntu-minimal trusty test with a bionic one

Add a bionic test in replacement of trusty.  We are already building
bionic images in the gate, so this seems like a good time to switch.

Change-Id: I20d4c25e9b79e7326c86767c36be8615ba0888a3
---
 .../elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg   | 1 +
 .../test-elements/bionic-build-succeeds/README.rst            | 4 ++++
 .../test-elements/bionic-build-succeeds/element-deps          | 3 +++
 .../bionic-build-succeeds/environment.d/10-set-distro.bash    | 1 +
 .../test-elements/bionic-build-succeeds/test-output-formats   | 1 +
 tests/run_functests.sh                                        | 3 +++
 6 files changed, 13 insertions(+)
 create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/README.rst
 create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/element-deps
 create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/environment.d/10-set-distro.bash
 create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/test-output-formats

diff --git a/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg b/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg
index 95832c67..b0fc1dd8 100755
--- a/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg
+++ b/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg
@@ -32,6 +32,7 @@ if [ -d ${APT_DIR} ]; then
     FILE=${APT_DIR}/99unauthenticated
     sudo dd of=${FILE} <<EOF
 APT::Get::AllowUnauthenticated "true";
+Acquire::AllowInsecureRepositories "true";
 EOF
     sudo chmod 0644 ${FILE}
 fi
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/README.rst
new file mode 100644
index 00000000..624e34e4
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/README.rst
@@ -0,0 +1,4 @@
+Verify we can build a ubuntu-minimal image.
+
+Note this test includes the vm element to test the bootloader install,
+and specifies to output a .qcow2
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/element-deps
new file mode 100644
index 00000000..9c94dfd6
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/element-deps
@@ -0,0 +1,3 @@
+block-device-mbr
+openstack-ci-mirrors
+vm
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/environment.d/10-set-distro.bash
new file mode 100644
index 00000000..ba2fb47d
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/environment.d/10-set-distro.bash
@@ -0,0 +1 @@
+export DIB_RELEASE=bionic
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/test-output-formats
new file mode 100644
index 00000000..c780936b
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-build-succeeds/test-output-formats
@@ -0,0 +1 @@
+tar,qcow2
\ No newline at end of file
diff --git a/tests/run_functests.sh b/tests/run_functests.sh
index 3344cf18..14660779 100755
--- a/tests/run_functests.sh
+++ b/tests/run_functests.sh
@@ -51,6 +51,9 @@ DEFAULT_SKIP_TESTS=(
 
     # This job is a bit unreliable, even if we get mirroring
     debian-minimal/testing-build-succeeds
+
+    # Replaced by bionic
+    ubuntu-minimal/trusty-build-succeeds
 )
 
 # The default output formats (specified to disk-image-create's "-t"