From 808454b5615940d88e4c9124578f1b67a7140d4d Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 13 Dec 2018 13:16:40 +0200 Subject: [PATCH] On RHEL 7 `compose info` is `compose details` --- tests/cli/test_build_and_deploy_aws.sh | 2 +- tests/cli/test_build_and_deploy_azure.sh | 2 +- tests/cli/test_build_and_deploy_openstack.sh | 2 +- tests/cli/test_build_and_deploy_vmware.sh | 2 +- tests/cli/test_compose_ext4-filesystem.sh | 2 +- tests/cli/test_compose_partitioned-disk.sh | 2 +- tests/cli/test_compose_sanity.sh | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cli/test_build_and_deploy_aws.sh b/tests/cli/test_build_and_deploy_aws.sh index fc648ae1..7cb74071 100755 --- a/tests/cli/test_build_and_deploy_aws.sh +++ b/tests/cli/test_build_and_deploy_aws.sh @@ -79,7 +79,7 @@ __EOF__ rlPhaseStartTest "compose finished" 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 ..." sleep 30 done; diff --git a/tests/cli/test_build_and_deploy_azure.sh b/tests/cli/test_build_and_deploy_azure.sh index 56dd75c7..d7b40c5a 100755 --- a/tests/cli/test_build_and_deploy_azure.sh +++ b/tests/cli/test_build_and_deploy_azure.sh @@ -64,7 +64,7 @@ rlJournalStart rlPhaseStartTest "compose finished" 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 ..." sleep 30 done; diff --git a/tests/cli/test_build_and_deploy_openstack.sh b/tests/cli/test_build_and_deploy_openstack.sh index d09b8c84..bc424ec3 100755 --- a/tests/cli/test_build_and_deploy_openstack.sh +++ b/tests/cli/test_build_and_deploy_openstack.sh @@ -69,7 +69,7 @@ __EOF__ rlPhaseStartTest "compose finished" 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 ..." sleep 30 done; diff --git a/tests/cli/test_build_and_deploy_vmware.sh b/tests/cli/test_build_and_deploy_vmware.sh index e5f47111..aaab9b55 100755 --- a/tests/cli/test_build_and_deploy_vmware.sh +++ b/tests/cli/test_build_and_deploy_vmware.sh @@ -92,7 +92,7 @@ __EOF__ rlPhaseStartTest "compose finished" 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 ..." sleep 30 done; diff --git a/tests/cli/test_compose_ext4-filesystem.sh b/tests/cli/test_compose_ext4-filesystem.sh index e0170476..6e17b1d7 100755 --- a/tests/cli/test_compose_ext4-filesystem.sh +++ b/tests/cli/test_compose_ext4-filesystem.sh @@ -24,7 +24,7 @@ rlJournalStart rlPhaseStartTest "compose finished" if [ -n "$UUID" ]; then - until $CLI compose info $UUID | grep FINISHED; do + until $CLI compose details $UUID | grep FINISHED; do sleep 60 rlLogInfo "Waiting for compose to finish ..." done; diff --git a/tests/cli/test_compose_partitioned-disk.sh b/tests/cli/test_compose_partitioned-disk.sh index 165eca57..7f6544ec 100755 --- a/tests/cli/test_compose_partitioned-disk.sh +++ b/tests/cli/test_compose_partitioned-disk.sh @@ -24,7 +24,7 @@ rlJournalStart rlPhaseStartTest "compose finished" if [ -n "$UUID" ]; then - until $CLI compose info $UUID | grep FINISHED; do + until $CLI compose details $UUID | grep FINISHED; do sleep 60 rlLogInfo "Waiting for compose to finish ..." done; diff --git a/tests/cli/test_compose_sanity.sh b/tests/cli/test_compose_sanity.sh index f82c7632..37a9c4f2 100755 --- a/tests/cli/test_compose_sanity.sh +++ b/tests/cli/test_compose_sanity.sh @@ -19,9 +19,9 @@ rlJournalStart UUID=`echo $UUID | cut -f 2 -d' '` rlPhaseEnd - rlPhaseStartTest "compose info" + rlPhaseStartTest "compose details" 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 rlFail "Compose UUID is empty!" fi @@ -29,7 +29,7 @@ rlJournalStart rlPhaseStartTest "compose image" if [ -n "$UUID" ]; then - until $CLI compose info $UUID | grep FINISHED; do + until $CLI compose details $UUID | grep FINISHED; do sleep 60 rlLogInfo "Waiting for compose to finish ..." done;