From 8b7f2dda0b1543423ff9d4850bf1717cf4d55412 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 10 Mar 2022 19:23:38 +0100 Subject: [PATCH] copr-builder: don't give up RHSM unregistering This way we have less work in the periodic cron job (see cleanup-unused-redhat-subscriptions script). --- roles/copr/backend/templates/resalloc/vm-delete.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/copr/backend/templates/resalloc/vm-delete.j2 b/roles/copr/backend/templates/resalloc/vm-delete.j2 index 8ec1132a64..e6aa657a17 100755 --- a/roles/copr/backend/templates/resalloc/vm-delete.j2 +++ b/roles/copr/backend/templates/resalloc/vm-delete.j2 @@ -6,7 +6,12 @@ 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) -ssh root@"$1" "subscription-manager unregister" || : + +# Don't give-up unregistering after the first attempt +for _ in a b c; do + ssh root@"$1" "subscription-manager unregister" && break + sleep 5 +done case "$RESALLOC_POOL_ID" in *aws*)