[tests] Use a function to wait for compose to finish

The function is meant to replace the duplicate pieces of code used in various
tests, the polling interval is unified to 20 seconds.

tests/cli/lib/lib.sh

@@ -97,3 +97,18 @@ check_compose_status() {
         return 1
     fi
 }
+
+# Wait until the compose is done (finished or failed)
+wait_for_compose() {
+    local UUID=$1
+    if [ -n "$UUID" ]; then
+        until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
+            sleep 20
+            rlLogInfo "Waiting for compose to finish ..."
+        done;
+        check_compose_status "$UUID"
+    else
+        rlFail "Compose UUID is empty!"
+    fi
+}
+

tests/cli/test_build_and_deploy_aws.sh

@@ -84,14 +84,7 @@ __EOF__
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                rlLogInfo "Waiting for compose to finish ..."
-                sleep 30
-            done;
-        else
-            rlFail "Compose UUID is empty!"
-        fi
     rlPhaseEnd
 
     rlPhaseStartTest "Import AMI image in AWS"

tests/cli/test_build_and_deploy_azure.sh

@@ -67,14 +67,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                rlLogInfo "Waiting for compose to finish ..."
-                sleep 30
-            done;
-        else
-            rlFail "Compose UUID is empty!"
-        fi
     rlPhaseEnd
 
     rlPhaseStartTest "Upload image to Azure"

tests/cli/test_build_and_deploy_openstack.sh

@@ -77,14 +77,7 @@ __EOF__
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+      wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                rlLogInfo "Waiting for compose to finish ..."
-                sleep 30
-            done;
-        else
-            rlFail "Compose UUID is empty!"
-        fi
     rlPhaseEnd
 
     rlPhaseStartTest "Upload QCOW2 image to OpenStack"

tests/cli/test_build_and_deploy_vmware.sh

@@ -98,14 +98,7 @@ __EOF__
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                rlLogInfo "Waiting for compose to finish ..."
-                sleep 30
-            done;
-        else
-            rlFail "Compose UUID is empty!"
-        fi
     rlPhaseEnd
 
     rlPhaseStartTest "Upload VMDK image in vCenter"

tests/cli/test_compose_ext4-filesystem.sh

@@ -27,15 +27,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                sleep 10
-                rlLogInfo "Waiting for compose to finish ..."
-            done;
-            check_compose_status "$UUID"
-        else
-            rlFail "Compose UUID is empty!"
-        fi
     rlPhaseEnd
 
     rlPhaseStartCleanup

tests/cli/test_compose_google.sh

@@ -23,15 +23,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStart "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                sleep 10
-                rlLogInfo "Waiting for compose to finish..."
-            done
-            check_compose_status "$UUID"
-        else
-            flFail "Compose UUID is empty!"
-        fi
     rlPhaseEnd
 
     rlPhaseStart "compose check"

tests/cli/test_compose_live-iso.sh

@@ -30,15 +30,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                sleep 20
-                rlLogInfo "Waiting for compose to finish ..."
-            done;
-            check_compose_status "$UUID"
-        else
-            rlFail "Compose UUID is empty!"
-        fi
 
         rlRun -t -c "$CLI compose image $UUID"
         IMAGE="$UUID-live.iso"

tests/cli/test_compose_partitioned-disk.sh

@@ -27,15 +27,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                sleep 10
-                rlLogInfo "Waiting for compose to finish ..."
-            done;
-            check_compose_status "$UUID"
-        else
-            rlFail "Compose UUID is empty!"
-        fi
     rlPhaseEnd
 
     rlPhaseStartCleanup

tests/cli/test_compose_qcow2.sh

@@ -58,16 +58,7 @@ __EOF__
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                sleep 20
-                rlLogInfo "Waiting for compose to finish ..."
-            done;
-            check_compose_status "$UUID"
-        else
-            rlFail "Compose UUID is empty!"
-        fi
-
         rlRun -t -c "$CLI compose image $UUID"
         IMAGE="$UUID-disk.qcow2"
     rlPhaseEnd

tests/cli/test_compose_sanity.sh

@@ -31,11 +31,8 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "compose image"
+        wait_for_compose $UUID
         if [ -n "$UUID" ]; then
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                sleep 5
-                rlLogInfo "Waiting for compose to finish ..."
-            done;
             check_compose_status "$UUID"
 
             rlRun -t -c "$CLI compose image $UUID"
@@ -45,8 +42,6 @@ rlJournalStart
             rlAssertExists    "/var/lib/lorax/composer/results/$UUID/"
             rlAssertExists    "/var/lib/lorax/composer/results/$UUID/root.tar.xz"
             rlAssertNotDiffer "/var/lib/lorax/composer/results/$UUID/root.tar.xz" "$UUID-root.tar.xz"
-        else
-            rlFail "Compose UUID is empty!"
         fi
     rlPhaseEnd
 

tests/cli/test_compose_tar.sh

@@ -29,15 +29,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "compose finished"
-        if [ -n "$UUID" ]; then
+        wait_for_compose $UUID
-            until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
-                sleep 10
-                rlLogInfo "Waiting for compose to finish ..."
-            done;
-            check_compose_status "$UUID"
-        else
-            rlFail "Compose UUID is empty!"
-        fi
 
         # Running a compose can lead to a different selinux policy in the
         # kernel, which may break docker. Reload the policy from the host and