Skip to content

Fix VM cleanup issue and improve VM deletion logic for containerd periodic jobs #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bharti-0211 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix VM cleanup issue and improve VM deletion logic for containerd periodic jobs #310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions test-containerd/instantiate_vm_and_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

ID=""
SSH_KEY=""
NAME=""
NETWORK=""
Expand All @@ -26,7 +27,7 @@ EOF
}

function delete_vm() {
if [ -z $1 ]; then echo "Nothing to delete. delete_vm requires the vm ID as an argument."; return; fi
if [ -z "${1:-}" ]; then echo "Nothing to delete. delete_vm requires the vm ID as an argument."; return; fi

# Ensure we are yet connected
echo "" | ibmcloud login
Expand All @@ -35,7 +36,7 @@ function delete_vm() {
}

function delete_network() {
if [ -z $1 ]; then echo "Nothing to delete. delete_network requires the network ID as an argument."; return; fi
if [ -z "${1:-}" ]; then echo "Nothing to delete. delete_network requires the network ID as an argument."; return; fi

# Ensure we are yet connected
echo "" | ibmcloud login
Expand All @@ -60,6 +61,20 @@ function delete_network() {
return $NET_DEL_EXIT
}

function cleanup() {
set +e
if [ -n "${ID:-}" ]; then
echo "Cleaning up VM $ID"
delete_vm "$ID"
sleep 120
fi
if [ -n "${NETWORK:-}" ]; then
echo "Cleaning up network $NETWORK"
delete_network "$NETWORK"
fi
}
trap cleanup EXIT

# Get options
while [[ $# != 0 ]]; do
case "$1" in
Expand Down Expand Up @@ -107,7 +122,7 @@ while [ $i -lt $TIMEOUT ] && [ -z "$(ibmcloud pi instance get $ID | grep 'Extern
sleep 60
done
# Fail to connect
if [ "$i" == "$TIMEOUT" ]; then echo "FAIL: fail to get IP" ; delete_vm $ID; sleep 120; delete_network $NETWORK; exit 1; fi
if [ "$i" == "$TIMEOUT" ]; then echo "FAIL: fail to get IP" ; exit 1; fi

IP=$(ibmcloud pi instance get $ID | grep -Eo "External Address:[[:space:]]*[0-9.]+" | cut -d ' ' -f3)

Expand Down Expand Up @@ -144,9 +159,4 @@ fi
# Get test script and execute it
ssh ubuntu@$IP -i /etc/ssh-volume/containerd-key wget https://raw.githubusercontent.com/ppc64le-cloud/docker-ce-build/main/test-containerd/test_on_powervs.sh
ssh ubuntu@$IP -i /etc/ssh-volume/containerd-key sudo bash test_on_powervs.sh $RUNC_FLAVOR $TEST_RUNTIME
scp -i /etc/ssh-volume/containerd-key "ubuntu@$IP:/home/containerd_test/containerd/*.xml" ${OUTPUT}

delete_vm $ID
sleep 120
delete_network $NETWORK

scp -i /etc/ssh-volume/containerd-key "ubuntu@$IP:/home/containerd_test/containerd/*.xml" ${OUTPUT}