From e29cb9bd4b623575ba9839b8d217a7b07b75f46d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 26 Apr 2024 07:33:05 -0700 Subject: [PATCH 1/2] Revert "Disable F40 CI (CVE-2024-3094 response)" F40 is safe to use again This reverts commit 0cc7cc99e69272acbcf357516688512a9654b95d. --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3ddd1e1ad..5a7416f470 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,6 +100,8 @@ RPM: - aws/fedora-38-aarch64 - aws/fedora-39-x86_64 - aws/fedora-39-aarch64 + - aws/fedora-40-x86_64 + - aws/fedora-40-aarch64 - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-aarch64 - aws/rhel-8.9-ga-x86_64 @@ -546,6 +548,8 @@ API: RUNNER: - aws/fedora-39-x86_64 - aws/fedora-39-aarch64 + - aws/fedora-40-x86_64 + - aws/fedora-40-aarch64 - IMAGE_TYPE: ["aws"] RUNNER: - aws/rhel-8.9-ga-aarch64 From 92aac661fce1701f3c9979f63451d0a481759e29 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 26 Apr 2024 12:03:48 -0700 Subject: [PATCH 2/2] Schutzfile: Use newer osbuild snapshot --- Schutzfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Schutzfile b/Schutzfile index 59666cc7d4..59c8bdfc7f 100644 --- a/Schutzfile +++ b/Schutzfile @@ -132,14 +132,14 @@ { "title": "fedora", "name": "fedora", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-x86_64-rawhide-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-x86_64-branched-20240515" } ], "aarch64": [ { "title": "fedora", "name": "fedora", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-aarch64-rawhide-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f40/f40-aarch64-branched-20240515" } ] } @@ -325,4 +325,4 @@ } ] } -} \ No newline at end of file +}