From 6b9547b3f09ee34820868dd6ce560b49abfe6753 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 11 Jan 2025 21:16:30 +0100 Subject: [PATCH] copr-be: vm-delete + vm-release - fix for yaml data --- roles/copr/backend/templates/resalloc/vm-delete.j2 | 9 +++++++-- roles/copr/backend/templates/resalloc/vm-release.j2 | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/roles/copr/backend/templates/resalloc/vm-delete.j2 b/roles/copr/backend/templates/resalloc/vm-delete.j2 index b5ae6e0c09..523fdabe40 100755 --- a/roles/copr/backend/templates/resalloc/vm-delete.j2 +++ b/roles/copr/backend/templates/resalloc/vm-delete.j2 @@ -5,11 +5,16 @@ die(){ echo >&2 "!! $*"; exit 1; } test -z "$RESALLOC_NAME" && die "no vm specified, empty \$RESALLOC_NAME variable" # Try to, best effort, remove the entitlement. -set -- $(echo "$RESALLOC_RESOURCE_DATA" | base64 --decode) +decoded=$(echo "$RESALLOC_RESOURCE_DATA" | base64 --decode) +IP=$(echo "$decoded" | yq .host || :) +if test -z "$IP"; then + set -- $(echo "$decoded") + IP=$1 +fi # Don't give-up unregistering after the first attempt for _ in a b c; do - timeout 180 ssh root@"$1" "subscription-manager unregister" && break + timeout 180 ssh root@"$IP" "subscription-manager unregister" && break sleep 5 done diff --git a/roles/copr/backend/templates/resalloc/vm-release.j2 b/roles/copr/backend/templates/resalloc/vm-release.j2 index 9772ec1bf1..301f4a796f 100755 --- a/roles/copr/backend/templates/resalloc/vm-release.j2 +++ b/roles/copr/backend/templates/resalloc/vm-release.j2 @@ -8,6 +8,11 @@ test -n "$RESALLOC_NAME" test -n "$RESALLOC_RESOURCE_DATA" # we only put IP out in spawning script, nothing else -set -- $(echo "$RESALLOC_RESOURCE_DATA" | base64 --decode) -IP=$1 +decoded=$(echo "$RESALLOC_RESOURCE_DATA" | base64 --decode) +IP=$(echo "$decoded" | yq .host || :) +if test -z "$IP"; then + set -- $(echo "$decoded") + IP=$1 +fi + ssh -o ConnectTimeout=10 "root@$IP" copr-builder-cleanup