diff --git a/xCAT-test/unit/xcat_release_package.t b/xCAT-test/unit/xcat_release_package.t index 4a818d8a5..a129c5144 100644 --- a/xCAT-test/unit/xcat_release_package.t +++ b/xCAT-test/unit/xcat_release_package.t @@ -12,6 +12,7 @@ my $repo_root = File::Spec->rel2abs(File::Spec->catdir($FindBin::Bin, '..', '..' my $spec = read_file('xcat-release/xcat-release.spec'); like($spec, qr/^Name:\s+xcat-release$/m, 'package has the expected name'); like($spec, qr/^BuildArch:\s+noarch$/m, 'package is architecture independent'); +like($spec, qr/^Requires:\s+dnf$/m, 'package is limited to DNF-based systems'); like($spec, qr/^%config\(noreplace\) .*xcat-core\.repo$/m, 'core repo preserves local changes'); like($spec, qr/^%config\(noreplace\) .*xcat-dep\.repo$/m, 'dependency repo preserves local changes'); like($spec, qr{RPM-GPG-KEY-xCAT}, 'package installs the signing key'); @@ -59,6 +60,7 @@ sub assert_repo_security { my ($content, $label) = @_; like($content, qr/^enabled=1$/m, "$label repo is enabled"); like($content, qr/^gpgcheck=1$/m, "$label repo verifies packages"); + like($content, qr/^repo_gpgcheck=1$/m, "$label repo verifies repository metadata"); like( $content, qr{^gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xCAT$}m, diff --git a/xcat-release/xcat-core.repo b/xcat-release/xcat-core.repo index 206ea16ef..c6add8aa4 100644 --- a/xcat-release/xcat-core.repo +++ b/xcat-release/xcat-core.repo @@ -3,4 +3,5 @@ name=xCAT Core packages baseurl=https://xcat.org/files/xcat/repos/yum/latest/xcat-core enabled=1 gpgcheck=1 +repo_gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xCAT diff --git a/xcat-release/xcat-dep.repo b/xcat-release/xcat-dep.repo index 57e426e0d..6da572b2d 100644 --- a/xcat-release/xcat-dep.repo +++ b/xcat-release/xcat-dep.repo @@ -3,4 +3,5 @@ name=xCAT dependencies baseurl=https://xcat.org/files/xcat/repos/yum/latest/xcat-dep/rh$releasever/$basearch enabled=1 gpgcheck=1 +repo_gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-xCAT diff --git a/xcat-release/xcat-release.spec b/xcat-release/xcat-release.spec index 5e549b4b5..2fa676237 100644 --- a/xcat-release/xcat-release.spec +++ b/xcat-release/xcat-release.spec @@ -1,4 +1,4 @@ -Summary: xCAT repository configuration +Summary: xCAT DNF repository configuration Name: xcat-release Version: %{?version:%{version}}%{!?version:%(cat Version)} Release: %{?release:%{release}}%{!?release:%(cat Release)} @@ -6,10 +6,11 @@ License: EPL URL: https://xcat.org/ Source0: xcat-release-%{version}.tar.gz BuildArch: noarch +Requires: dnf %description -Installs the xCAT core and dependency repository definitions and the public -signing key used to verify their packages. +Installs the xCAT core and dependency DNF repository definitions and the public +signing key used to verify their packages and repository metadata. %prep %setup -q -n xcat-release