From 3587ed36637e5d44201a0192f9079b52a6766859 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Wed, 29 May 2019 11:30:10 +0300
Subject: [PATCH] Split live-iso and qcow2 and update test scenario execution

this makes it possible to have more granular test execution
reported as separate statuses on GitHub. ATM we will have:

- cockpit/fedora-30
- cockpit/fedora-30/live-iso
- cockpit/fedora-30/qcow2
- cockpit/fedora-30/aws
- cockpit/fedora-30/azure
- cockpit/fedora-30/openstack
- cockpit/fedora-30/vmware
---
 test/check-cli | 17 ++++++++++++++---
 test/run       | 10 ++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/test/check-cli b/test/check-cli
index 675a22bd..8700afe0 100755
--- a/test/check-cli
+++ b/test/check-cli
@@ -4,15 +4,22 @@ import composertest
 import unittest
 
 
-class TestSanity(composertest.ComposerTestCase):
+class TestImages(composertest.ComposerTestCase):
+    """
+        This is the "entry-point" to the test suite when
+        executed in Cockpit CI. If $TEST_SCENARIO=="" or
+        $TEST_SCENARIO="images" we end up here.
+
+        New test methods should be added here first!
+        When this target becomes too slow we split out into
+        separate scenarios!
+    """
     def test_blueprint_sanity(self):
         self.runCliTest("/tests/cli/test_blueprints_sanity.sh")
 
     def test_compose_sanity(self):
         self.runCliTest("/tests/cli/test_compose_sanity.sh")
 
-
-class TestImages(composertest.ComposerTestCase):
     def test_ext4_filesystem(self):
         self.runCliTest("/tests/cli/test_compose_ext4-filesystem.sh")
 
@@ -22,9 +29,13 @@ class TestImages(composertest.ComposerTestCase):
     def test_tar(self):
         self.runCliTest("/tests/cli/test_compose_tar.sh")
 
+
+class TestQcow2(composertest.ComposerTestCase):
     def test_qcow2(self):
         self.runCliTest("/tests/cli/test_compose_qcow2.sh")
 
+
+class TestLiveIso(composertest.ComposerTestCase):
     @unittest.skip("https://github.com/weldr/lorax/issues/731")
     def test_live_iso(self):
         self.runCliTest("/tests/cli/test_compose_live-iso.sh")
diff --git a/test/run b/test/run
index fa8fb404..4be74f4d 100755
--- a/test/run
+++ b/test/run
@@ -5,7 +5,13 @@
 make vm
 
 if [ -n "$TEST_SCENARIO" ]; then
-  test/check-cloud TestCloud.test_$TEST_SCENARIO
+  if [ "$TEST_SCENARIO" == "live-iso" ]; then
+    test/check-cli TestLiveIso
+  elif [ "$TEST_SCENARIO" == "qcow2" ]; then
+    test/check-cli TestQcow2
+  else
+    test/check-cloud TestCloud.test_$TEST_SCENARIO
+  fi
 else
-  test/check-cli
+  test/check-cli TestImages
 fi