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

tests: Fail immediately when image build fails 

We were checking for composer's FINISHED status only, which meant that
when a compose failed, the test ran until it timed out.

Check for failed as well. Also, always time out after 30 minutes.
This commit is contained in:
Lars Karlitski 2019-05-20 19:13:16 +02:00
parent 4783f6562f
commit c261cec33d
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cli/test_build_and_deploy_aws.sh
View File

@ -81,7 +81,7 @@ __EOF__
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
rlLogInfo "Waiting for compose to finish ..."
sleep 30
done;

2
tests/cli/test_build_and_deploy_azure.sh
View File

@ -66,7 +66,7 @@ rlJournalStart
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
rlLogInfo "Waiting for compose to finish ..."
sleep 30
done;

2
tests/cli/test_build_and_deploy_openstack.sh
View File

@ -76,7 +76,7 @@ __EOF__
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
rlLogInfo "Waiting for compose to finish ..."
sleep 30
done;

2
tests/cli/test_build_and_deploy_vmware.sh
View File

@ -97,7 +97,7 @@ __EOF__
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
rlLogInfo "Waiting for compose to finish ..."
sleep 30
done;

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

@ -25,7 +25,7 @@ rlJournalStart
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
sleep 10
rlLogInfo "Waiting for compose to finish ..."
done;

2
tests/cli/test_compose_google.sh
View File

@ -21,7 +21,7 @@ rlJournalStart
rlPhaseStart "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
sleep 10
rlLogInfo "Waiting for compose to finish..."
done

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

@ -26,7 +26,7 @@ rlJournalStart
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
sleep 20
rlLogInfo "Waiting for compose to finish ..."
done;

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

@ -25,7 +25,7 @@ rlJournalStart
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
sleep 10
rlLogInfo "Waiting for compose to finish ..."
done;

2
tests/cli/test_compose_qcow2.sh
View File

@ -54,7 +54,7 @@ __EOF__
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
sleep 20
rlLogInfo "Waiting for compose to finish ..."
done;

2
tests/cli/test_compose_sanity.sh
View File

@ -29,7 +29,7 @@ rlJournalStart
rlPhaseStartTest "compose image"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
sleep 5
rlLogInfo "Waiting for compose to finish ..."
done;

2
tests/cli/test_compose_tar.sh
View File

@ -23,7 +23,7 @@ rlJournalStart
rlPhaseStartTest "compose finished"
if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do
until $CLI compose info $UUID | grep 'FINISHED\|FAILED'; do
sleep 10
rlLogInfo "Waiting for compose to finish ..."
done;