On RHEL 7 compose info is compose details

This commit is contained in:
Alexander Todorov 2018-12-13 13:16:40 +02:00 committed by Alexander Todorov
parent 74792f6b6e
commit 808454b561
7 changed files with 9 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -19,9 +19,9 @@ rlJournalStart
UUID=`echo $UUID | cut -f 2 -d' '` UUID=`echo $UUID | cut -f 2 -d' '`
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "compose info" rlPhaseStartTest "compose details"
if [ -n "$UUID" ]; then if [ -n "$UUID" ]; then
rlRun -t -c "$CLI compose info $UUID | egrep 'RUNNING|WAITING'" rlRun -t -c "$CLI compose details $UUID | egrep 'RUNNING|WAITING'"
else else
rlFail "Compose UUID is empty!" rlFail "Compose UUID is empty!"
fi fi
@ -29,7 +29,7 @@ rlJournalStart
rlPhaseStartTest "compose image" rlPhaseStartTest "compose image"
if [ -n "$UUID" ]; then if [ -n "$UUID" ]; then
until $CLI compose info $UUID | grep FINISHED; do until $CLI compose details $UUID | grep FINISHED; do
sleep 60 sleep 60
rlLogInfo "Waiting for compose to finish ..." rlLogInfo "Waiting for compose to finish ..."
done; done;