From 3c4194ddb0de8da75d9d98e9f5af2f0f8b66dd19 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:48:19 -0400
Subject: [PATCH] Merge pull request #508 from
 mikedep333/fix_ci_nightly_failure

Fix CI failing to compose-up for 2 reasons

(cherry picked from commit 7c05605595d8221d2744658f648d39dafad2fbc8)
---
 .github/workflows/pulp_images.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml
index b5b028f2..8fa1f8d2 100644
--- a/.github/workflows/pulp_images.yml
+++ b/.github/workflows/pulp_images.yml
@@ -186,6 +186,12 @@ jobs:
           echo ::endgroup::
           echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
           pip install podman-compose
+          if [[ $(dpkg-query --showformat='${Version}' --show podman) == "3.4.4+ds1-1ubuntu1.22.04.1" && $(dpkg-query --showformat='${Version}' --show containernetworking-plugins) == "0.9.1+ds1-1" ]]
+          then
+            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-1_amd64.deb
+            sudo dpkg -i containernetworking-plugins_1.1.1+ds1-1_amd64.deb
+          fi
         shell: bash
       - name: Build images
         run: |
@@ -242,7 +248,11 @@ jobs:
             # Reuse the folders from the s6 mode tests
             FILE="docker-compose.folders.yml"
             # We'll pull the web image from a registry since we didn't build it.
-            WEB_TAG="${APP_BRANCH}"
+            if [ "${{ matrix.image_variant }}" == "nightly" ]; then
+              WEB_TAG="nightly"
+            else
+              WEB_TAG="${APP_BRANCH}"
+            fi
           else
             FILE="docker-compose.yml"
             WEB_TAG="${TEMP_APP_TAG}"