mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-07-31 10:09:40 +00:00
fix: capitalize xCAT
Signed-off-by: Vinícius Ferrão <2031761+viniciusferrao@users.noreply.github.com>
This commit is contained in:
+4
-4
@@ -134,7 +134,7 @@ my @PACKAGES = qw(
|
||||
xCAT-server
|
||||
xCAT-test
|
||||
xCAT-vlan
|
||||
xcat-release
|
||||
xCAT-release
|
||||
);
|
||||
|
||||
my @TARGETS = (
|
||||
@@ -629,7 +629,7 @@ sub createrepo_dir {
|
||||
# src.rpm enters the binary repomd, and index the SRPMS repo separately.
|
||||
sub index_repo {
|
||||
my ($repodir) = @_;
|
||||
my $alias = "$repodir/xcat-release-latest.noarch.rpm";
|
||||
my $alias = "$repodir/xCAT-release-latest.noarch.rpm";
|
||||
|
||||
# The stable bootstrap filename is a direct-download convenience, not a
|
||||
# second package. Keep it out of repository metadata.
|
||||
@@ -652,9 +652,9 @@ sub update_repo {
|
||||
|
||||
sub write_release_alias {
|
||||
my ($repodir) = @_;
|
||||
my $alias = "$repodir/xcat-release-latest.noarch.rpm";
|
||||
my $alias = "$repodir/xCAT-release-latest.noarch.rpm";
|
||||
|
||||
my @release_rpms = glob("$repodir/xcat-release-$VERSION-$RELEASE.noarch.rpm");
|
||||
my @release_rpms = glob("$repodir/xCAT-release-$VERSION-$RELEASE.noarch.rpm");
|
||||
if (@release_rpms == 1) {
|
||||
cp $release_rpms[0], $alias;
|
||||
chmod 0644, $alias;
|
||||
|
||||
@@ -6,10 +6,10 @@ xCAT software and repo files can be obtained from: `<http://xcat.org/download.ht
|
||||
Internet Repository
|
||||
-------------------
|
||||
|
||||
Install ``xcat-release`` to configure both the ``xcat-core`` and ``xcat-dep``
|
||||
Install ``xCAT-release`` to configure both the ``xcat-core`` and ``xcat-dep``
|
||||
repositories and their signing key::
|
||||
|
||||
dnf install https://xcat.org/files/xcat/repos/yum/latest/xcat-core/xcat-release-latest.noarch.rpm
|
||||
dnf install https://xcat.org/files/xcat/repos/yum/latest/xcat-core/xCAT-release-latest.noarch.rpm
|
||||
|
||||
The dependency repository is selected automatically from the operating-system
|
||||
release and architecture reported by DNF. The installed repository files are
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
Summary: xCAT DNF repository configuration
|
||||
Name: xcat-release
|
||||
Name: xCAT-release
|
||||
Version: %{?version:%{version}}%{!?version:%(cat Version)}
|
||||
Release: %{?release:%{release}}%{!?release:%(cat Release)}
|
||||
License: EPL
|
||||
URL: https://xcat.org/
|
||||
Source0: xcat-release-%{version}.tar.gz
|
||||
Source0: xCAT-release-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
Requires: dnf
|
||||
|
||||
@@ -13,7 +13,7 @@ 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
|
||||
%setup -q -n xCAT-release
|
||||
|
||||
%build
|
||||
|
||||
@@ -9,15 +9,16 @@ use Test::More;
|
||||
|
||||
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');
|
||||
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/^Source0:\s+xCAT-release-%\{version\}\.tar\.gz$/m, 'source archive follows the package 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');
|
||||
|
||||
my $core = read_file('xcat-release/xcat-core.repo');
|
||||
my $core = read_file('xCAT-release/xcat-core.repo');
|
||||
assert_repo_security($core, 'core');
|
||||
like(
|
||||
$core,
|
||||
@@ -25,7 +26,7 @@ like(
|
||||
'core repo uses the stable HTTPS endpoint'
|
||||
);
|
||||
|
||||
my $dep = read_file('xcat-release/xcat-dep.repo');
|
||||
my $dep = read_file('xCAT-release/xcat-dep.repo');
|
||||
assert_repo_security($dep, 'dependency');
|
||||
like(
|
||||
$dep,
|
||||
@@ -33,7 +34,7 @@ like(
|
||||
'dependency repo follows the DNF release and architecture variables'
|
||||
);
|
||||
|
||||
my $key = read_file('xcat-release/RPM-GPG-KEY-xCAT');
|
||||
my $key = read_file('xCAT-release/RPM-GPG-KEY-xCAT');
|
||||
like($key, qr/^-----BEGIN PGP PUBLIC KEY BLOCK-----$/m, 'signing key is ASCII armored');
|
||||
is(
|
||||
sha256_hex($key),
|
||||
@@ -42,7 +43,17 @@ is(
|
||||
);
|
||||
|
||||
my $builder = read_file('buildrpms.pl');
|
||||
like($builder, qr/^\s+xcat-release\s*$/m, 'default RPM build includes xcat-release');
|
||||
like($builder, qr/^\s+xCAT-release\s*$/m, 'default RPM build includes xCAT-release');
|
||||
like(
|
||||
$builder,
|
||||
qr{\$repodir/xCAT-release-latest\.noarch\.rpm},
|
||||
'stable bootstrap alias follows the package name'
|
||||
);
|
||||
like(
|
||||
$builder,
|
||||
qr{\$repodir/xCAT-release-\$VERSION-\$RELEASE\.noarch\.rpm},
|
||||
'stable bootstrap alias selects the xCAT-release RPM'
|
||||
);
|
||||
like(
|
||||
$builder,
|
||||
qr/unlink \$alias.*?createrepo_dir\(\$repodir/s,
|
||||
|
||||
Reference in New Issue
Block a user