From 7be88554afc1cab96d0298653abcc93bd8bae7c3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 27 Apr 2018 14:58:28 +0100
Subject: [PATCH] slow tests: Add slow tests of Ubuntu 18.04.

 - firstboot
 - settings
 - password setting
 - console
 - v2v conversion
---
 builder/Makefile.am   | 3 ++-
 customize/Makefile.am | 9 ++++++---
 v2v/Makefile.am       | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/builder/Makefile.am b/builder/Makefile.am
index c7b50778a..7ede544b7 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -432,7 +432,8 @@ console_test_scripts := \
 	test-console-fedora-24.sh \
 	test-console-ubuntu-12.04.sh \
 	test-console-ubuntu-14.04.sh \
-	test-console-ubuntu-16.04.sh
+	test-console-ubuntu-16.04.sh \
+	test-console-ubuntu-18.04.sh
 
 test-console-%.sh:
 	rm -f $@ $@-t
diff --git a/customize/Makefile.am b/customize/Makefile.am
index d584287f8..936fa0073 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -245,7 +245,8 @@ firstboot_test_scripts := \
 	test-firstboot-ubuntu-10.04.sh \
 	test-firstboot-ubuntu-12.04.sh \
 	test-firstboot-ubuntu-14.04.sh \
-	test-firstboot-ubuntu-16.04.sh
+	test-firstboot-ubuntu-16.04.sh \
+	test-firstboot-ubuntu-18.04.sh
 # Firstboot is known-broken on RHEL 3:
 #	test-firstboot-rhel-3.9.sh
 
@@ -270,7 +271,8 @@ password_test_scripts := \
 	test-password-ubuntu-10.04.sh \
 	test-password-ubuntu-12.04.sh \
 	test-password-ubuntu-14.04.sh \
-	test-password-ubuntu-16.04.sh
+	test-password-ubuntu-16.04.sh \
+	test-password-ubuntu-18.04.sh
 
 test-password-%.sh:
 	rm -f $@ $@-t
@@ -291,7 +293,8 @@ settings_test_scripts := \
 	test-settings-ubuntu-10.04.sh \
 	test-settings-ubuntu-12.04.sh \
 	test-settings-ubuntu-14.04.sh \
-	test-settings-ubuntu-16.04.sh
+	test-settings-ubuntu-16.04.sh \
+	test-settings-ubuntu-18.04.sh
 # Since firstboot is broken, we cannot test settings in RHEL 3:
 #	test-settings-rhel-3.9.sh
 
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index af43aa9f1..34cad197b 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -428,7 +428,8 @@ real_guests_scripts = \
 	test-v2v-conversion-of-ubuntu-10.04.sh \
 	test-v2v-conversion-of-ubuntu-12.04.sh \
 	test-v2v-conversion-of-ubuntu-14.04.sh \
-	test-v2v-conversion-of-ubuntu-16.04.sh
+	test-v2v-conversion-of-ubuntu-16.04.sh \
+	test-v2v-conversion-of-ubuntu-18.04.sh
 
 test-v2v-conversion-of-%.sh:
 	rm -f $@ $@-t