diff --git a/1374-test-rename-the-start-limit-subtest.patch b/1374-test-rename-the-start-limit-subtest.patch new file mode 100644 index 0000000..19515c5 --- /dev/null +++ b/1374-test-rename-the-start-limit-subtest.patch @@ -0,0 +1,37 @@ +From 9c200c01eeb947d2300da421e8994ef9d286183e Mon Sep 17 00:00:00 2001 +From: Frantisek Sumsal +Date: Wed, 19 Aug 2026 09:56:52 +0200 +Subject: [PATCH] test: rename the start limit subtest + +It uses the current upstream naming, unfortunately in RHEL 9 we still +use the previous one, so the test was not picked up by the +TEST-07-PID1's main test script. + +Also, unmask & enable the systemd-resolved service, as the old testing +framework masks it by default. + +rhel-only: ci +Related: RHEL-164539 + +Follow-up for 4060cdad388b0ae658f2024633b842a46c37962e. +--- + ...{TEST-07-PID1.start-limit.sh => testsuite-07.start-limit.sh} | 2 ++ + 1 file changed, 2 insertions(+) + rename test/units/{TEST-07-PID1.start-limit.sh => testsuite-07.start-limit.sh} (93%) + +diff --git a/test/units/TEST-07-PID1.start-limit.sh b/test/units/testsuite-07.start-limit.sh +similarity index 93% +rename from test/units/TEST-07-PID1.start-limit.sh +rename to test/units/testsuite-07.start-limit.sh +index 93447452da..ebd8ac50ac 100755 +--- a/test/units/TEST-07-PID1.start-limit.sh ++++ b/test/units/testsuite-07.start-limit.sh +@@ -15,6 +15,8 @@ at_exit() { + + trap at_exit EXIT + ++systemctl unmask systemd-resolved.service ++systemctl enable systemd-resolved.service + mkdir -p /run/systemd/system/systemd-resolved.service.d/ + cat >/run/systemd/system/systemd-resolved.service.d/99-start-limit.conf < +Date: Wed, 19 Aug 2026 12:24:43 +0200 +Subject: [PATCH] ci: install GPG keys for Fedora 42 + +Fedora 42 is EOL and the official keyring doesn't have its keys anymore. +This, in combination with a pretty old version of mkosi means we have to +improvise a bit to get the old keys at the correct place, so we can +bootstrap the tools tree with the old Fedora release. + +rhel-only: ci +Related: RHEL-155457 +--- + .github/workflows/mkosi.yml | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml +index 0fa3141b5f..23375bdb13 100644 +--- a/.github/workflows/mkosi.yml ++++ b/.github/workflows/mkosi.yml +@@ -66,6 +66,16 @@ jobs: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - uses: systemd/mkosi@857838464970f1092cc0107f4b1df714d0744990 + ++ - name: Install GPG keys for Fedora 42 ++ run: | ++ sudo mkdir -p /usr/share/distribution-gpg-keys ++ sudo apt-get install -y curl cpio rpm2cpio ++ tmpdir=$(mktemp -d) ++ curl -sL https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/42/Server/x86_64/os/Packages/f/fedora-gpg-keys-42-1.noarch.rpm | ++ rpm2cpio | cpio -idmv -D "$tmpdir" ++ sudo mv "$tmpdir/etc/pki/rpm-gpg" /usr/share/distribution-gpg-keys/fedora ++ rm -rf "$tmpdir" ++ + - name: Configure + run: | + tee mkosi.local.conf </dev/null || : %{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/* %changelog +* Wed Aug 19 2026 systemd maintenance team - 252-78 +- test: rename the start limit subtest (RHEL-164539) +- ci: install GPG keys for Fedora 42 (RHEL-155457) + * Tue Aug 18 2026 systemd maintenance team - 252-77 - test: include util.sh needed for assert_*() functions (RHEL-155457) - test: drop forgotten `set +e` (RHEL-155457)