From d9dcb3fe99a4782b1cb4ddb9179a5e86ff73be96 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 16 Dec 2016 11:42:59 -0500
Subject: [PATCH] Increase func testing for ubuntu-minimal element

Since we still run these 3 version of ubuntu-minimal elements in
openstack-infra, also run functional testing for them.

Trusty and xenial will be in voting gate, precise added as skipped for
non-voting.

Add the default skip/run status to the "-l" output just to confirm
this too.

Change-Id: Icfbfd0cb7d9acae824972474b77e2fe0486c4f69
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../{build-succeeds => precise-build-succeeds}/README.rst | 0
 .../environment.d/10-set-distro.bash                      | 1 +
 .../test-elements/trusty-build-succeeds/README.rst        | 1 +
 .../environment.d/10-set-distro.bash                      | 1 +
 .../test-elements/xenial-build-succeeds/README.rst        | 1 +
 .../environment.d/10-set-distro.bash                      | 1 +
 tests/run_functests.sh                                    | 8 +++++++-
 7 files changed, 12 insertions(+), 1 deletion(-)
 rename elements/ubuntu-minimal/test-elements/{build-succeeds => precise-build-succeeds}/README.rst (100%)
 create mode 100644 elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash
 create mode 100644 elements/ubuntu-minimal/test-elements/trusty-build-succeeds/README.rst
 create mode 100644 elements/ubuntu-minimal/test-elements/trusty-build-succeeds/environment.d/10-set-distro.bash
 create mode 100644 elements/ubuntu-minimal/test-elements/xenial-build-succeeds/README.rst
 create mode 100644 elements/ubuntu-minimal/test-elements/xenial-build-succeeds/environment.d/10-set-distro.bash

diff --git a/elements/ubuntu-minimal/test-elements/build-succeeds/README.rst b/elements/ubuntu-minimal/test-elements/precise-build-succeeds/README.rst
similarity index 100%
rename from elements/ubuntu-minimal/test-elements/build-succeeds/README.rst
rename to elements/ubuntu-minimal/test-elements/precise-build-succeeds/README.rst
diff --git a/elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash b/elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash
new file mode 100644
index 00000000..3747859b
--- /dev/null
+++ b/elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash
@@ -0,0 +1 @@
+export DIB_RELEASE=precise
diff --git a/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/README.rst b/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/README.rst
new file mode 100644
index 00000000..b7190827
--- /dev/null
+++ b/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/README.rst
@@ -0,0 +1 @@
+Verify we can build a ubuntu-minimal image.
diff --git a/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/environment.d/10-set-distro.bash b/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/environment.d/10-set-distro.bash
new file mode 100644
index 00000000..02d902a4
--- /dev/null
+++ b/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/environment.d/10-set-distro.bash
@@ -0,0 +1 @@
+export DIB_RELEASE=trusty
diff --git a/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/README.rst b/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/README.rst
new file mode 100644
index 00000000..b7190827
--- /dev/null
+++ b/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/README.rst
@@ -0,0 +1 @@
+Verify we can build a ubuntu-minimal image.
diff --git a/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/environment.d/10-set-distro.bash b/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/environment.d/10-set-distro.bash
new file mode 100644
index 00000000..7cc2c887
--- /dev/null
+++ b/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/environment.d/10-set-distro.bash
@@ -0,0 +1 @@
+export DIB_RELEASE=xenial
diff --git a/tests/run_functests.sh b/tests/run_functests.sh
index 9c1e3ed4..36896e3c 100755
--- a/tests/run_functests.sh
+++ b/tests/run_functests.sh
@@ -19,6 +19,7 @@ DEFAULT_SKIP_TESTS=(
     # in non-voting
     gentoo/build-succeeds
     opensuse/build-succeeds
+    ubuntu-minimal/precise-build-succeeds
     # good to have the test case around - but because of changes
     # in testing does not work always.
     debian-minimal/testing-build-succeeds
@@ -194,7 +195,12 @@ while getopts ":hlj:t" opt; do
             echo "The available functional tests are:"
             echo
             for t in ${TESTS[@]}; do
-                echo "  $t"
+                echo -n "  $t"
+                if [[ " ${DEFAULT_SKIP_TESTS[@]} " =~ " ${t} " ]]; then
+                    echo " [skip]"
+                else
+                    echo " [run]"
+                fi
             done
             echo
             exit 0