From 2c282ecdb8e115745da0c1a2d9e4ff8ca2eb0643 Mon Sep 17 00:00:00 2001
From: Gerrod Ubben <gerrodubben@gmail.com>
Date: Mon, 9 Dec 2024 09:36:34 -0500
Subject: [PATCH 1/2] Remove a CI workaround fix that is no longer needed

---
 .github/actions/build_image/action.yml | 12 ------------
 .github/actions/test_image/action.yml  |  6 ++++++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/actions/build_image/action.yml b/.github/actions/build_image/action.yml
index 86b577ee..33b35ea7 100644
--- a/.github/actions/build_image/action.yml
+++ b/.github/actions/build_image/action.yml
@@ -59,18 +59,6 @@ runs:
         podman load -i base-images.tar
       shell: bash
 
-    - name: Install httpie and podman-compose
-      run: |
-        echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
-        echo "Working around https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394"
-        curl -O http://archive.ubuntu.com/ubuntu/pool/universe/g/golang-github-containernetworking-plugins/containernetworking-plugins_1.1.1+ds1-3_amd64.deb
-        sudo dpkg -i containernetworking-plugins_1.1.1+ds1-3_amd64.deb
-        # Ubuntu 22.04 has old podman 3.4.4, we need podman-compose==1.0.3 to avoid an
-        # error with dependency contianers not being detected as running.
-        # "error generating dependency graph for container"
-        pip install httpie podman-compose==1.0.3
-      shell: bash
-
     - name: Build images
       run: |
         podman version
diff --git a/.github/actions/test_image/action.yml b/.github/actions/test_image/action.yml
index 2e24f264..ec69ee18 100644
--- a/.github/actions/test_image/action.yml
+++ b/.github/actions/test_image/action.yml
@@ -19,6 +19,12 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Install httpie and podman-compose
+      run: |
+        echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
+        pip install httpie podman-compose
+      shell: bash
+
     - name: Test image with upgrade in s6 mode (pulp)
       if: inputs.image_name == 'pulp'
       run: |

From 5ca588e745e2a51b6a3bcff1b5b19c0e86b59daa Mon Sep 17 00:00:00 2001
From: Gerrod Ubben <gerrodubben@gmail.com>
Date: Mon, 9 Dec 2024 11:43:59 -0500
Subject: [PATCH 2/2] Run the compose test only on the minimal images

---
 .github/actions/test_image/action.yml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/.github/actions/test_image/action.yml b/.github/actions/test_image/action.yml
index ec69ee18..ecdb9cae 100644
--- a/.github/actions/test_image/action.yml
+++ b/.github/actions/test_image/action.yml
@@ -43,19 +43,8 @@ runs:
       shell: bash
 
     - name: Test Compose up
+      if: inputs.image_name == 'pulp-minimal' || inputs.image_name == 'galaxy-minimal'
       run: |
-        if [[ "${{ inputs.image_name }}" == "pulp" || "${{ inputs.image_name }}" == "galaxy" ]]; then
-          FILE="compose.folders.yml"
-          # We'll pull the web image from a registry since we didn't build it.
-          if [ "${{ inputs.image_variant }}" == "nightly" ]; then
-            WEB_TAG="nightly"
-          else
-            WEB_TAG="${{ inputs.app_branch }}"
-          fi
-        else
-          FILE="compose.yml"
-          WEB_TAG="${{ inputs.app_arch_tag }}"
-        fi
         base_image=$(echo ${{ inputs.image_name }} | cut -d '-' -f1)
-        images/compose/test.sh "${{ inputs.image_name }}:${{ inputs.app_arch_tag }}" "${base_image}-web:${WEB_TAG}" $FILE
+        images/compose/test.sh "${{ inputs.image_name }}:${{ inputs.app_arch_tag }}" "${base_image}-web:${{ inputs.app_arch_tag }}" "compose.yml"
       shell: bash