almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

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

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

Cherry-picked from 836f0ddf

Related: rhbz#1769525
This commit is contained in:
Jiri Kortus 2019-09-06 18:56:19 +02:00 committed by Alexander Todorov
parent e7f2706461
commit 16daa25137
12 changed files with 26 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/cli/lib/lib.sh
View File

@ -152,3 +152,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
}

9
tests/cli/test_build_and_deploy_aws.sh
View File

@ -82,14 +82,7 @@ __EOF__
rlPhaseEnd
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
rlPhaseEnd
rlPhaseStartTest "Import AMI image in AWS"

9
tests/cli/test_build_and_deploy_azure.sh
View File

@ -69,14 +69,7 @@ rlJournalStart
rlPhaseEnd
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
rlPhaseEnd
rlPhaseStartTest "Upload image to Azure"

9
tests/cli/test_build_and_deploy_openstack.sh
View File

@ -77,14 +77,7 @@ __EOF__
rlPhaseEnd
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
rlPhaseEnd
rlPhaseStartTest "Upload QCOW2 image to OpenStack"

9
tests/cli/test_build_and_deploy_vmware.sh
View File

@ -98,14 +98,7 @@ __EOF__
rlPhaseEnd
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
rlPhaseEnd
rlPhaseStartTest "Upload VMDK image in vCenter"

10
tests/cli/test_compose_ext4-filesystem.sh
View File

@ -27,15 +27,7 @@ rlJournalStart
rlPhaseEnd
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
rlPhaseEnd
rlPhaseStartCleanup

10
tests/cli/test_compose_google.sh
View File

@ -23,15 +23,7 @@ rlJournalStart
rlPhaseEnd
rlPhaseStart "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
rlPhaseEnd
rlPhaseStart "compose check"

10
tests/cli/test_compose_live-iso.sh
View File

@ -30,15 +30,7 @@ rlJournalStart
rlPhaseEnd
rlPhaseStartTest "compose finished"
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
wait_for_compose $UUID
rlRun -t -c "$CLI compose image $UUID"
IMAGE="$UUID-live.iso"

10
tests/cli/test_compose_partitioned-disk.sh
View File

@ -27,15 +27,7 @@ rlJournalStart
rlPhaseEnd
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
rlPhaseEnd
rlPhaseStartCleanup

11
tests/cli/test_compose_qcow2.sh
View File

@ -58,16 +58,7 @@ __EOF__
rlPhaseEnd
rlPhaseStartTest "compose finished"
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
wait_for_compose $UUID
rlRun -t -c "$CLI compose image $UUID"
IMAGE="$UUID-disk.qcow2"
rlPhaseEnd

7
tests/cli/test_compose_sanity.sh
View File

@ -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

10
tests/cli/test_compose_tar.sh
View File

@ -29,15 +29,7 @@ rlJournalStart
rlPhaseEnd
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
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
wait_for_compose $UUID
# Running a compose can lead to a different selinux policy in the
# kernel, which may break docker. Reload the policy from the host and