From: Neil Horman <nhorman@openssl.org>
Date: Thu, 24 Apr 2025 12:28:42 +0000 (-0400)
Subject: Add retry capability to apt commands in quic interop
X-Git-Tag: openssl-3.6.0-alpha1~768
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5810149e6566564a790bd6d3279159528015f915;p=thirdparty%2Fopenssl.git

Add retry capability to apt commands in quic interop

We're getting more frequent overnight failures in quic interop due to
failing updates that appear transient when conducting apt installs

Add the capability to do retry commands here

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27489)
---

diff --git a/.github/workflows/run_quic_interop.yml b/.github/workflows/run_quic_interop.yml
index 4f0511f9ee8..84988729513 100644
--- a/.github/workflows/run_quic_interop.yml
+++ b/.github/workflows/run_quic_interop.yml
@@ -22,12 +22,18 @@ jobs:
         with:
          repository: 'quic-interop/quic-interop-runner'
          fetch-depth: 0
-      - name: Install dependencies
+      - name: Install python requirements
         run: |
-          pip install -r requirements.txt
-          sudo add-apt-repository ppa:wireshark-dev/stable
-          sudo apt-get update
-          sudo apt-get install -y tshark
+          for i in {1..3}; do pip install -r requirements.txt && break; sleep 10; done
+      - name: Add tshark repo
+        run: |
+          for i in {1..3}; do sudo add-apt-repository ppa:wireshark-dev/stable && break; sleep 10; done
+      - name: Update apt repos
+        run: |
+          for i in {1..3}; do sudo apt-get update && break; sleep 10; done
+      - name: Install tshark
+        run: |
+          for i in {1..3}; do sudo apt-get install -y tshark && break; sleep 10; done
       - name: Patch implementations file
         run: |
           jq '.openssl = { image: "quay.io/openssl-ci/openssl-quic-interop"
@@ -53,12 +59,18 @@ jobs:
         with:
          repository: 'quic-interop/quic-interop-runner'
          fetch-depth: 0
-      - name: Install dependencies
+      - name: Install python requirements
+        run: |
+          for i in {1..3}; do pip install -r requirements.txt && break; sleep 10; done
+      - name: Add tshark repo
+        run: |
+          for i in {1..3}; do sudo add-apt-repository ppa:wireshark-dev/stable && break; done
+      - name: Update apt repos
+        run: |
+          for i in {1..3}; do sudo apt-get update && break; done
+      - name: Install tshark
         run: |
-          pip install -r requirements.txt
-          sudo add-apt-repository ppa:wireshark-dev/stable
-          sudo apt-get update
-          sudo apt-get install -y tshark
+          for i in {1..3}; do sudo apt-get install -y tshark && break; done
       - name: Patch implementations file
         run: |
           jq '.openssl = { image: "quay.io/openssl-ci/openssl-quic-interop"