diff --git a/.github/workflows/build-stage.yml b/.github/workflows/build-stage.yml index 6a30e6c00..36dec48ef 100644 --- a/.github/workflows/build-stage.yml +++ b/.github/workflows/build-stage.yml @@ -79,7 +79,7 @@ jobs: -v "$PWD/work:/work:Z" \ -v "$PWD/packages:/packages:ro,Z" \ -v "$PWD/config:/repos:ro,Z" \ - quay.io/fedora/fedora@sha256:a58a82ed658c109c104e97fdcce52690337cff52e68dc8fa9c033a5fe38dfeec bash -exc ' + quay.io/fedora/fedora@sha256:3fd2f356c5ff2d2b28cc94f661d2f66b3fafdba236ec5288a075905bc66a7381 bash -exc ' # The fedora:rawhide image ships fedora-cisco-openh264 enabled, but # its packages are signed with Cisco key, which the image does not # trust -- so any builddep graph reaching gstreamer/pipewire dies on diff --git a/.github/workflows/packit-srpm-pilot.yml b/.github/workflows/packit-srpm-pilot.yml index 61e078183..bd7ac4e45 100644 --- a/.github/workflows/packit-srpm-pilot.yml +++ b/.github/workflows/packit-srpm-pilot.yml @@ -101,7 +101,7 @@ jobs: -v "$PWD:/repo:Z" \ -v "$PWD/work/srpm:/out:Z" \ -w /repo \ - quay.io/packit/packit@sha256:8a1784251c51eed7a094820c894e2ee7f4ed4bbce4eb78eb172a04de3fae43e1 bash -exc ' + quay.io/packit/packit@sha256:c617706074f95f07715590279ade94704b4e797167105dcc53957dfc2086d5b1 bash -exc ' git config --global --add safe.directory "*" packit srpm --preserve-spec --output "/out/$PACKAGE.src.rpm" -p "$PACKAGE" python3 tools/source_pipeline.py "$PACKAGE" --verify-staged packages diff --git a/.github/workflows/rebuild-rpms.yml b/.github/workflows/rebuild-rpms.yml index b17212b5a..fc968af5f 100644 --- a/.github/workflows/rebuild-rpms.yml +++ b/.github/workflows/rebuild-rpms.yml @@ -169,7 +169,7 @@ jobs: -v "$PWD/work:/work:Z" \ -v "$PWD/packages:/packages:ro,Z" \ -v "$PWD/config:/repos:ro,Z" \ - quay.io/fedora/fedora@sha256:a58a82ed658c109c104e97fdcce52690337cff52e68dc8fa9c033a5fe38dfeec bash -exc ' + quay.io/fedora/fedora@sha256:3fd2f356c5ff2d2b28cc94f661d2f66b3fafdba236ec5288a075905bc66a7381 bash -exc ' disable=--disablerepo=fedora-cisco-openh264 # The Fedora container images set tsflags=nodocs, so every %doc file is # dropped at install time. rand_core ships its crate docs that way and @@ -298,7 +298,7 @@ jobs: docker run --rm \ -v "$PWD/built:/built:ro,Z" \ -v "$PWD/config:/repos:ro,Z" \ - quay.io/fedora/fedora@sha256:a58a82ed658c109c104e97fdcce52690337cff52e68dc8fa9c033a5fe38dfeec bash -exc ' + quay.io/fedora/fedora@sha256:3fd2f356c5ff2d2b28cc94f661d2f66b3fafdba236ec5288a075905bc66a7381 bash -exc ' dnf -y install rpmdevtools >/dev/null cp /repos/hummingbird.repo /etc/yum.repos.d/ disable=--disablerepo=fedora-cisco-openh264 diff --git a/tests/test_packit_srpm.py b/tests/test_packit_srpm.py index bf6cf192d..8478709c4 100644 --- a/tests/test_packit_srpm.py +++ b/tests/test_packit_srpm.py @@ -41,7 +41,7 @@ def test_workflow_stages_verified_sources_for_every_configured_package(self) -> self.assertIn("create-archive:", PACKIT_CONFIG.read_text()) self.assertIn("tools/packit_source0.py", PACKIT_CONFIG.read_text()) self.assertIn( - "quay.io/packit/packit@sha256:8a1784251c51eed7a094820c894e2ee7f4ed4bbce4eb78eb172a04de3fae43e1", + "quay.io/packit/packit@sha256:c617706074f95f07715590279ade94704b4e797167105dcc53957dfc2086d5b1", workflow, ) self.assertNotIn(