From c24ad2fed7dda9c02636c564eedd0b602cd08ffc Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Mon, 18 Feb 2019 19:17:31 +0200
Subject: [PATCH] New test: Verify tar images with Docker and systemd-nspawn

- on some arches (also Fedora x86_64) systemd-nspawn may not be
  available
- delete composes from other tests in rlPhaseStartCleanup because
  we're seeing the tar compose kind of hanging in Jenkins and that
  test script is executed last so the slave may be running out of
  disk space. Be a good citizen and clean up after the previous
  tests.

Related: rhbz#1656105
---
 Makefile                                   |  3 +-
 tests/cli/test_compose_ext4-filesystem.sh  |  4 ++
 tests/cli/test_compose_partitioned-disk.sh |  4 ++
 tests/cli/test_compose_tar.sh              | 68 ++++++++++++++++++++++
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100755 tests/cli/test_compose_tar.sh

diff --git a/Makefile b/Makefile
index 41c52e4f..1a1e9f52 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,8 @@ test: docs
 # but even so fails in Travis CI
 test_images:
 	sudo -E ./tests/test_cli.sh tests/cli/test_compose_ext4-filesystem.sh \
-				    tests/cli/test_compose_partitioned-disk.sh
+				    tests/cli/test_compose_partitioned-disk.sh \
+				    tests/cli/test_compose_tar.sh
 
 test_aws:
 	sudo -E ./tests/test_cli.sh tests/cli/test_build_and_deploy_aws.sh
diff --git a/tests/cli/test_compose_ext4-filesystem.sh b/tests/cli/test_compose_ext4-filesystem.sh
index d7d62e14..22f54497 100755
--- a/tests/cli/test_compose_ext4-filesystem.sh
+++ b/tests/cli/test_compose_ext4-filesystem.sh
@@ -34,5 +34,9 @@ rlJournalStart
         fi
     rlPhaseEnd
 
+    rlPhaseStartCleanup
+        rlRun -t -c "$CLI compose delete $UUID"
+    rlPhaseEnd
+
 rlJournalEnd
 rlJournalPrintText
diff --git a/tests/cli/test_compose_partitioned-disk.sh b/tests/cli/test_compose_partitioned-disk.sh
index 78f52423..0b6553c8 100755
--- a/tests/cli/test_compose_partitioned-disk.sh
+++ b/tests/cli/test_compose_partitioned-disk.sh
@@ -34,5 +34,9 @@ rlJournalStart
         fi
     rlPhaseEnd
 
+    rlPhaseStartCleanup
+        rlRun -t -c "$CLI compose delete $UUID"
+    rlPhaseEnd
+
 rlJournalEnd
 rlJournalPrintText
diff --git a/tests/cli/test_compose_tar.sh b/tests/cli/test_compose_tar.sh
new file mode 100755
index 00000000..f12a0ae4
--- /dev/null
+++ b/tests/cli/test_compose_tar.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+# Note: execute this file from the project root directory
+
+#####
+#
+# Builds tar images and tests them with Docker and systemd-nspawn
+#
+#####
+
+. /usr/share/beakerlib/beakerlib.sh
+
+CLI="./src/bin/composer-cli"
+
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertExists /usr/bin/docker
+    rlPhaseEnd
+
+    rlPhaseStartTest "compose start"
+        rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"
+        UUID=`$CLI compose start example-http-server tar`
+        rlAssertEquals "exit code should be zero" $? 0
+
+        UUID=`echo $UUID | cut -f 2 -d' '`
+    rlPhaseEnd
+
+    rlPhaseStartTest "compose finished"
+        if [ -n "$UUID" ]; then
+            until $CLI compose info $UUID | grep FINISHED; do
+                sleep 10
+                rlLogInfo "Waiting for compose to finish ..."
+            done;
+        else
+            rlFail "Compose UUID is empty!"
+        fi
+
+        rlRun -t -c "$CLI compose image $UUID"
+        IMAGE="$UUID-root.tar.xz"
+    rlPhaseEnd
+
+    rlPhaseStartTest "Verify tar image with Docker"
+        rlRun -t -c "docker import $IMAGE composer/$UUID:latest"
+
+        # verify we can run a container with this image
+        rlRun -t -c "docker run -it --rm --entrypoint /usr/bin/cat composer/$UUID /etc/redhat-release"
+    rlPhaseEnd
+
+    rlPhaseStartTest "Verify tar image with systemd-nspawn"
+        if [ -f /usr/bin/systemd-nspawn ]; then
+            NSPAWN_DIR=`mktemp -d /tmp/nspawn.XXXX`
+            rlRun -t -c "tar -xJvf $IMAGE -C $NSPAWN_DIR"
+
+            # verify we can run a container with this image
+            rlRun -t -c "systemd-nspawn -D $NSPAWN_DIR cat /etc/redhat-release"
+        else
+            rlLogInfo "systemd-nspawn not found!"
+        fi
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun -t -c "rm -rf $IMAGE $NSPAWN_DIR"
+        rlRun -t -c "$CLI compose delete $UUID"
+        rlRun -t -c "docker rmi composer/$UUID"
+    rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText