From eef874c41280454653af0de1675128e97128ec6c Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Thu, 15 Jun 2023 15:41:30 -0400 Subject: [PATCH 1/2] Fix CI failing to compose-up the nightly s6 images because it is looking for the non-existing tags of the development branch's web images. It should use "nightly" instead. [noissue] --- .github/workflows/pulp_images.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml index b5b028f2..1b0de5f7 100644 --- a/.github/workflows/pulp_images.yml +++ b/.github/workflows/pulp_images.yml @@ -242,7 +242,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}" From a8a25c32c929c1ee6a9c6ae8d81b7759bc7406db Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Mon, 26 Jun 2023 16:51:14 -0400 Subject: [PATCH 2/2] Workaround CI failing due to an ubuntu podman bug https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394 Workaround will disable itself when no longer needed [noissue] --- .github/workflows/pulp_images.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml index 1b0de5f7..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: |