From 3ec65955ad9fd8b15dc5ccfdb110fb292ca63cac Mon Sep 17 00:00:00 2001
From: Al Berez <al.berez@broadcom.com>
Date: Tue, 11 Mar 2025 13:34:30 -0700
Subject: [PATCH] Use GHA matrix strategy to test Debian OSes

---
 .../workflows/release-build-sign-upload.yml   | 21 ++++++++++-----
 .github/workflows/release-update-repos.yml    | 27 ++++++++++++++-----
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release-build-sign-upload.yml b/.github/workflows/release-build-sign-upload.yml
index 0b385f60891..7ff8598f7a3 100644
--- a/.github/workflows/release-build-sign-upload.yml
+++ b/.github/workflows/release-build-sign-upload.yml
@@ -905,6 +905,14 @@ jobs:
     needs:
     - setup
     - build-linux
+    strategy:
+      matrix:
+        image:
+        - debian:11
+        - debian:12
+        - ubuntu:20.04
+        - ubuntu:22.04
+        - ubuntu
     runs-on: ubuntu-latest
     steps:
 
@@ -913,21 +921,20 @@ jobs:
       with:
         name: cf-cli-linux-deb-packages
 
-    - name: Display structure of downloaded files and test compression
+    - name: Display structure and verify
+      env:
+        IMAGE: ${{ matrix.image }}
       run: |
-        ls -R
-
-        for i in debian:11 debian:12 ubuntu:20.04 ubuntu:22.04 ubuntu; do docker run \
+        docker run \
           --interactive \
           --rm \
           -v .:/workspace \
-          ${i:?} <<EOC
-        printf "${i:?} -> "
+          ${IMAGE} <<EOC
+        printf "${IMAGE} -> "
         grep PRETTY_NAME /etc/os-release | cut -d= -f2-
         cd workspace
         ls *.deb | xargs -n1 dpkg --info
         EOC
-        done
 
   test-macos:
     name: Test macOS Artifacts
diff --git a/.github/workflows/release-update-repos.yml b/.github/workflows/release-update-repos.yml
index 80e7b1b170c..65c56a10452 100644
--- a/.github/workflows/release-update-repos.yml
+++ b/.github/workflows/release-update-repos.yml
@@ -305,6 +305,14 @@ jobs:
 
   test-deb:
     name: Test Debian Repository
+    strategy:
+      matrix:
+        image:
+        - debian:11
+        - debian:12
+        - ubuntu:20.04
+        - ubuntu:22.04
+        - ubuntu
     runs-on: ubuntu-latest
     needs:
     - setup
@@ -316,17 +324,23 @@ jobs:
     steps:
 
     - name: Install CF CLI via apt
+      env:
+        IMAGE: ${{ matrix.image }}
       run: |
+        docker run \
+          --interactive \
+          --rm \
+          ${IMAGE} <<EOC
         set -o pipefail -e
 
-        sudo apt update
-        sudo apt install -y wget gnupg
+        apt update
+        apt install -y wget gnupg
 
-        wget -q -O - ${CLAW_URL}/debian/cli.cloudfoundry.org.key | sudo apt-key add -
-        echo "deb ${CLAW_URL}/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+        wget -q -O - ${CLAW_URL}/debian/cli.cloudfoundry.org.key | apt-key add -
+        echo "deb ${CLAW_URL}/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list
 
-        sudo apt update
-        sudo apt install -y cf${VERSION_MAJOR}-cli
+        apt update
+        apt install -y cf${VERSION_MAJOR}-cli
 
         which cf
 
@@ -336,6 +350,7 @@ jobs:
         cf${VERSION_MAJOR} -v
 
         cf -v | grep "${VERSION_BUILD}"
+        EOC
 
   update-rpm:
     name: Update RPM Repository