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

tests: remove ALI_DIR after we're done using the cli

Browse Source 
also fix typo
This commit is contained in:
Alexander Todorov 2020-01-29 12:11:17 +02:00 committed by Brian C. Lane
parent 718ac31c47
commit e31fccc4ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cli/test_compose_alibaba.sh
View File

@ -170,7 +170,7 @@ __EOF__
rlLogInfo "Running INSTANCE_ID=$INSTANCE_ID with IP_ADDRESS=$IP_ADDRESS" rlLogInfo "Running INSTANCE_ID=$INSTANCE_ID with IP_ADDRESS=$IP_ADDRESS"
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "Verify EC2 instance" rlPhaseStartTest "Verify ECS instance"
# cloud-init default config differs between RHEL and Fedora # cloud-init default config differs between RHEL and Fedora
CLOUD_USER="cloud-user" CLOUD_USER="cloud-user"
if [ -f "/etc/fedora-release" ]; then if [ -f "/etc/fedora-release" ]; then
@ -186,11 +186,11 @@ __EOF__
rlRun -t -c "$ALI_DIR/aliyun ecs DeleteImage --Force True --ImageId $IMAGE_ID" rlRun -t -c "$ALI_DIR/aliyun ecs DeleteImage --Force True --ImageId $IMAGE_ID"
rlRun -t -c "$ALI_DIR/aliyun oss rm oss://$ALICLOUD_BUCKET/$IMAGE --force" rlRun -t -c "$ALI_DIR/aliyun oss rm oss://$ALICLOUD_BUCKET/$IMAGE --force"
rlRun -t -c "$CLI compose delete $UUID" rlRun -t -c "$CLI compose delete $UUID"
rlRun -t -c "rm -rf $IMAGE $SSH_KEY_DIR $ALI_DIR"
# do this here to give time for the VM instance to be removed properly # do this here to give time for the VM instance to be removed properly
# also don't fail if the key is still attached to an instance which is waiting # also don't fail if the key is still attached to an instance which is waiting
# to be desroyed. We're going to remove these keys in cleanup afterwards # to be desroyed. We're going to remove these keys in cleanup afterwards
$ALI_DIR/aliyun ecs DeleteKeyPairs --KeyPairNames "['$KEY_NAME']" || echo $ALI_DIR/aliyun ecs DeleteKeyPairs --KeyPairNames "['$KEY_NAME']" || echo
rlRun -t -c "rm -rf $IMAGE $SSH_KEY_DIR $ALI_DIR"
rlPhaseEnd rlPhaseEnd
rlJournalEnd rlJournalEnd