From 79a99410566994afaca9dd48e5b0ca2797090d4f Mon Sep 17 00:00:00 2001
From: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
Date: Thu, 5 Sep 2024 11:53:05 -0600
Subject: [PATCH] [v10.4.x] CI/CD: Update retry logic for package validation
 (#92998)

* CI/CD: Update retry logic for package validation (#92943)

* baldm0mma/retry_command/ update retry logic for package validation

* baldm0mma/retry_command/ update to 15 minutes

* baldm0mma/retry_command/ update to 30 minute retry

* baldm0mma/retry_command/ make drone

(cherry picked from commit d3ceaf41c29cbd4d33868ce3b4f9c47ba5bf5d4f)

* rem nx files

* rem more nx files
---
 .drone.yml                   | 18 +++++++++---------
 scripts/drone/steps/lib.star |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c4ba7f27465..f596d9e72f9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3043,8 +3043,8 @@ steps:
   - '            echo ''All attempts failed'''
   - '            exit 1'
   - '        fi'
-  - '        echo "Waiting 60 seconds before next attempt..."'
-  - '        sleep 60'
+  - '        echo "Waiting 30 seconds before next attempt..."'
+  - '        sleep 30'
   - '    fi'
   - done
   - 'echo "Step 6: Verifying Grafana installation..."'
@@ -3092,8 +3092,8 @@ steps:
   - '            echo ''All attempts failed'''
   - '            exit 1'
   - '        fi'
-  - '        echo "Waiting 60 seconds before next attempt..."'
-  - '        sleep 60'
+  - '        echo "Waiting 30 seconds before next attempt..."'
+  - '        sleep 30'
   - '    fi'
   - done
   - '    echo "Verifying GPG key..."'
@@ -3220,8 +3220,8 @@ steps:
   - '            echo ''All attempts failed'''
   - '            exit 1'
   - '        fi'
-  - '        echo "Waiting 60 seconds before next attempt..."'
-  - '        sleep 60'
+  - '        echo "Waiting 30 seconds before next attempt..."'
+  - '        sleep 30'
   - '    fi'
   - done
   - 'echo "Step 6: Verifying Grafana installation..."'
@@ -3270,8 +3270,8 @@ steps:
   - '            echo ''All attempts failed'''
   - '            exit 1'
   - '        fi'
-  - '        echo "Waiting 60 seconds before next attempt..."'
-  - '        sleep 60'
+  - '        echo "Waiting 30 seconds before next attempt..."'
+  - '        sleep 30'
   - '    fi'
   - done
   - '    echo "Verifying GPG key..."'
@@ -5272,6 +5272,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 71bca116e25bc9c212d16cd7516a8002dbf5d97aadcc1b2e0649a08b9a5bd4b0
+hmac: 9fe60398718bb207eeac82365b2fd0804806c98d68fad4b52c524b194c4281fb
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 7b3cc792fa9..3ea617ce018 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1146,7 +1146,8 @@ def publish_linux_packages_step(package_manager = "deb"):
         },
     }
 
-def retry_command(command, attempts = 5, delay = 60):
+# This retry will currently continue for 30 minutes until fail, unless successful.
+def retry_command(command, attempts = 60, delay = 30):
     return [
         "for i in $(seq 1 %d); do" % attempts,
         "    if %s; then" % command,