From: Ivan Kruglov Date: Thu, 12 Mar 2026 12:14:40 +0000 (-0700) Subject: test: use --nogpgcheck instead of --no-gpgchecks in TEST-88-UPGRADE X-Git-Tag: v260-rc3~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6eab41c8138e7704f523f16d933fadaba2ced75f;p=thirdparty%2Fsystemd.git test: use --nogpgcheck instead of --no-gpgchecks in TEST-88-UPGRADE --no-gpgchecks was introduced in 920483872449 but is only available in dnf5. Use --nogpgcheck instead, which is supported by both dnf4 and dnf5 (where it is an alias for --no-gpgchecks). Fixes test failure on distros still using dnf4 (e.g. CentOS/RHEL 9). Co-developed-by: Claude --- diff --git a/test/units/TEST-88-UPGRADE.sh b/test/units/TEST-88-UPGRADE.sh index faf3e3748ee..5cc1df21aae 100755 --- a/test/units/TEST-88-UPGRADE.sh +++ b/test/units/TEST-88-UPGRADE.sh @@ -84,7 +84,7 @@ timer2=$(systemctl show -P NextElapseUSecRealtime upgrade_timer_test.timer) # FIXME: See https://github.com/systemd/systemd/pull/39293 systemctl stop systemd-networkd-resolve-hook.socket || true -dnf downgrade --no-gpgchecks -y --allowerasing --disablerepo '*' "$pkgdir"/distro/*.rpm +dnf downgrade --nogpgcheck -y --allowerasing --disablerepo '*' "$pkgdir"/distro/*.rpm # Some distros don't ship networkd, so the test will always fail if command -v networkctl >/dev/null; then @@ -105,7 +105,7 @@ fi check_sd # Finally test the upgrade -dnf -y upgrade --no-gpgchecks --disablerepo '*' "$pkgdir"/devel/*.rpm +dnf -y upgrade --nogpgcheck --disablerepo '*' "$pkgdir"/devel/*.rpm # TODO: sanity checks check_sd