From 64998d853db27b90e975319a2ff3b34a34e19971 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 14 Nov 2019 08:48:58 -0800
Subject: [PATCH] tests: Add serial console to images we boot in CI

In some cases it will not boot without a console, and the CI framework
defaults to using serial console. So set it on live-iso, qcow2, and the
final iso installed with liveimg.

Related: rhbz#1770193
---
 tests/cli/test_compose_live-iso.sh      | 2 +-
 tests/cli/test_compose_qcow2.sh         | 2 +-
 tests/cli/test_compose_tar_kickstart.sh | 2 +-
 tests/test_cli.sh                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh
index ac369641..172998ab 100755
--- a/tests/cli/test_compose_live-iso.sh
+++ b/tests/cli/test_compose_live-iso.sh
@@ -66,7 +66,7 @@ name = "root"
 key = "$PUB_KEY"
 
 [customizations.kernel]
-append = "custom_cmdline_arg"
+append = "custom_cmdline_arg console=ttyS0,115200n8 console=tty0"
 __EOF__
 
         rlRun -t -c "$CLI blueprints push $TMP_DIR/with-ssh.toml"
diff --git a/tests/cli/test_compose_qcow2.sh b/tests/cli/test_compose_qcow2.sh
index e6ad0248..a385ecf6 100755
--- a/tests/cli/test_compose_qcow2.sh
+++ b/tests/cli/test_compose_qcow2.sh
@@ -46,7 +46,7 @@ name = "root"
 key = "$PUB_KEY"
 
 [customizations.kernel]
-append = "custom_cmdline_arg"
+append = "custom_cmdline_arg console=ttyS0,115200n8 console=tty0"
 __EOF__
 
         rlRun -t -c "$CLI blueprints push $TMP_DIR/with-ssh.toml"
diff --git a/tests/cli/test_compose_tar_kickstart.sh b/tests/cli/test_compose_tar_kickstart.sh
index 90067db4..9bb00ab8 100755
--- a/tests/cli/test_compose_tar_kickstart.sh
+++ b/tests/cli/test_compose_tar_kickstart.sh
@@ -79,7 +79,7 @@ timezone America/New_York
 keyboard us
 rootpw --lock
 sshkey --username root "$PUB_KEY"
-bootloader --location=mbr
+bootloader --location=mbr --append "custom_cmdline_arg console=ttyS0,115200n8 console=tty0"
 zerombr
 clearpart --initlabel --all
 autopart
diff --git a/tests/test_cli.sh b/tests/test_cli.sh
index 5692a276..217bcbca 100755
--- a/tests/test_cli.sh
+++ b/tests/test_cli.sh
@@ -51,7 +51,7 @@ function setup_tests {
     cat >> $blueprints_dir/example-http-server.toml << __EOF__
 
 [customizations.kernel]
-append = "custom_cmdline_arg"
+append = "custom_cmdline_arg console=ttyS0,115200n8 console=tty0"
 __EOF__
 }