From 99d76dae6c915b4bb65cd980ca94d3c3dae17f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?= <2031761+viniciusferrao@users.noreply.github.com> Date: Fri, 17 Jul 2026 15:05:08 -0300 Subject: [PATCH] fix: capitalize xCAT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vinícius Ferrão <2031761+viniciusferrao@users.noreply.github.com> --- buildrpms.pl | 8 +++---- .../install-guides/yum/configure_xcat.rst | 4 ++-- .../RPM-GPG-KEY-xCAT | 0 .../xCAT-release.spec | 6 ++--- {xcat-release => xCAT-release}/xcat-core.repo | 0 {xcat-release => xCAT-release}/xcat-dep.repo | 0 xCAT-test/unit/xcat_release_package.t | 23 ++++++++++++++----- 7 files changed, 26 insertions(+), 15 deletions(-) rename {xcat-release => xCAT-release}/RPM-GPG-KEY-xCAT (100%) rename xcat-release/xcat-release.spec => xCAT-release/xCAT-release.spec (92%) rename {xcat-release => xCAT-release}/xcat-core.repo (100%) rename {xcat-release => xCAT-release}/xcat-dep.repo (100%) diff --git a/buildrpms.pl b/buildrpms.pl index 2d9de0859..f6d3ed4db 100755 --- a/buildrpms.pl +++ b/buildrpms.pl @@ -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; diff --git a/docs/source/guides/install-guides/yum/configure_xcat.rst b/docs/source/guides/install-guides/yum/configure_xcat.rst index e4cee00d6..fba2ec140 100644 --- a/docs/source/guides/install-guides/yum/configure_xcat.rst +++ b/docs/source/guides/install-guides/yum/configure_xcat.rst @@ -6,10 +6,10 @@ xCAT software and repo files can be obtained from: `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,