mirror of
https://github.com/xcat2/xcat-dep.git
synced 2026-09-12 04:26:25 +00:00
40feffc8ce
Reviewed by @viniciusferrao. Each numbered point below is his; the code changes verify + fix it.
1. --build-number over-reach / dry-run / double-stamp
- The bump now runs ONLY on a real build: `--dry-run --build-number N` prints what it would
stamp and writes nothing (previously it rewrote every spec on disk during a dry run).
- Re-stamping is idempotent AND replacing: a re-run in a reused tree with a different
--build-number strips the prior .snap<ts>.<n> before applying the new one, instead of
accumulating a second stamp (…snap57.snap58). Extracted the per-line logic into the
unit-testable MockBuildUtils::restamp_release_line and covered it in t/mockbuild-all.t.
(The headline "rewrites xcat-core / xCAT-genesis-base.spec" does not occur in the real layout:
xcat-core is a sibling of $repo_root, and there is no genesis spec under the dep tree. The
legacy nested xcat-source-code case remains a non-CD layout; left as a follow-up.)
3. --finalize-xcat-dep idempotency
- cross_copy_genesis compared only SIGMD5 (content), which is blind to signature + index state.
It now also treats a same-content-but-UNSIGNED destination rpm as not-up-to-date (new
rpm_is_signed helper) so a crash between copy and sign heals on re-run.
- finalize_xcat_dep now re-indexes+signs BOTH repos of a touched pair every run, not only when
an rpm was copied, so a crash after copy+sign but before createrepo (rpm on disk, absent from
repomd) also heals.
4. Stale run-state can mask a failed build
- A real build now wipes its per-target $run_root first (run_id is derived from the deterministic
commit time, so re-runs reused the same tree). --skip-build keeps the tree; --dry-run writes nothing.
- mockbuild-perl-packages.pl clears each package's stale status.txt/error.txt BEFORE building, and
the aggregate now treats the child worker's exit code as authoritative: a package is PASS only if
its worker exited 0 AND wrote a PASS this run (a stale PASS in a reused log dir no longer counts).
5. --skip-build can publish the wrong artifacts
- --skip-build now REQUIRES an explicit --target (without it, all three EL targets collected the
same EL-agnostic roots and cross-published them).
- Collection is scoped to this target's own per-target $build_root (the same tree a normal build
populates), not the legacy build-output/list3/list5/list6 dirs.
- The manifest version-pin validation (and the "no manifest section" guard) now also run under
--skip-build, so a collection-only publish is validated exactly like a fresh build.
2. goconserver bypassed the CD bump (minimal fix; hermetic rebuild deferred)
- goconserver/mockbuild.pl gains --release-suffix, appended to its generated `Release: 4.elN`,
and mockbuild-all.pl passes the CD suffix down -- so goconserver's NVR advances per run like
every other dep package (an additive publish is no longer a silent no-op on a frozen NVR).
- Pinned the clone to an immutable upstream commit instead of the moving `master` (0.3.3 is
unreleased -- newest tag is v0.3.2 -- so a SHA pin is required; clone now fetches by ref).
- The host build + `go mod tidy` hermeticity concern is a tracked follow-up, not in this change.
7. Docs
- BUILD.md: --target is a single value, not repeatable; conserver-xcat is built for every target
(not "not required"). POD: --parallel-targets default is 1 = serial, not "auto".
- Added a manifest<->docs consistency test (conserver-xcat present in every target section).
(6, --max-parallel not a true global cap, is a documented nice-to-have and is left as a follow-up.)
Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
377 lines
13 KiB
Perl
Executable File
377 lines
13 KiB
Perl
Executable File
#!/usr/bin/perl
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Cwd qw(abs_path);
|
|
use File::Basename qw(dirname basename);
|
|
use File::Copy qw(copy);
|
|
use File::Path qw(make_path remove_tree);
|
|
use Getopt::Long qw(GetOptions);
|
|
|
|
my $script_dir = abs_path(dirname(__FILE__));
|
|
my $repo_root = abs_path("$script_dir/..");
|
|
my $pkg_dir = "$repo_root/goconserver";
|
|
|
|
my $work_dir = '/tmp/goconserver-mockbuild';
|
|
my $mock_cfg = '';
|
|
my $mock_uniqueext = '';
|
|
my $result_dir = "$repo_root/build-output/list5/goconserver";
|
|
my $log_dir = "$repo_root/build-logs/list5/goconserver";
|
|
my $skip_install = 0;
|
|
my $version = '0.3.3';
|
|
my $go_repo = 'https://github.com/xcat2/goconserver.git';
|
|
# Immutable pin: goconserver 0.3.3 is unreleased (newest tag v0.3.2) so it lives only on master.
|
|
# mockbuild-all.pl passes --go-ref with the canonical pin; this default keeps standalone runs
|
|
# reproducible too. `git clone --branch` cannot take a raw SHA, so the clone below fetches by ref.
|
|
my $go_ref = '6166fe5ec1c5b3c20475e322a9f0e8e93c87e45f';
|
|
my $release_suffix = ''; # CD Release bump (".snap<YYYYMMDDHHMM>.<n>"); passed by mockbuild-all.pl
|
|
my $build_timestamp;
|
|
|
|
GetOptions(
|
|
'work-dir=s' => \$work_dir,
|
|
'mock-cfg=s' => \$mock_cfg,
|
|
'mock-uniqueext=s' => \$mock_uniqueext,
|
|
'result-dir=s' => \$result_dir,
|
|
'log-dir=s' => \$log_dir,
|
|
'skip-install!' => \$skip_install,
|
|
'version=s' => \$version,
|
|
'go-repo=s' => \$go_repo,
|
|
'go-ref=s' => \$go_ref,
|
|
'release-suffix=s' => \$release_suffix,
|
|
'build-timestamp=i' => \$build_timestamp,
|
|
) or die usage();
|
|
|
|
die "Run as root (current uid=$>)\n" if $> != 0;
|
|
|
|
for my $bin (qw(go git rpmbuild rpm)) {
|
|
run("command -v " . sh_quote($bin) . " >/dev/null 2>&1");
|
|
}
|
|
|
|
my $arch = capture('uname -m');
|
|
if (!$mock_cfg) {
|
|
my $os_id = capture(q{bash -lc 'source /etc/os-release; echo $ID'});
|
|
$mock_cfg = resolve_mock_cfg($os_id, '10', $arch);
|
|
}
|
|
|
|
my ($rel) = $mock_cfg =~ /-(\d+)-/;
|
|
$rel //= '10';
|
|
|
|
my $SOURCE_DATE_EPOCH;
|
|
$SOURCE_DATE_EPOCH = $build_timestamp if defined $build_timestamp;
|
|
if (!$SOURCE_DATE_EPOCH && -f "$repo_root/Gitepoch") {
|
|
my $epoch_content = '';
|
|
if (open my $efh, '<', "$repo_root/Gitepoch") {
|
|
$epoch_content = <$efh>;
|
|
close $efh;
|
|
chomp $epoch_content;
|
|
}
|
|
$SOURCE_DATE_EPOCH = $epoch_content;
|
|
}
|
|
unless ($SOURCE_DATE_EPOCH && $SOURCE_DATE_EPOCH =~ /^\d+$/) {
|
|
$SOURCE_DATE_EPOCH = `git -C \Q$repo_root\E log -1 --format=%ct HEAD 2>/dev/null`;
|
|
chomp $SOURCE_DATE_EPOCH;
|
|
}
|
|
$SOURCE_DATE_EPOCH = time() unless $SOURCE_DATE_EPOCH =~ /^\d+$/;
|
|
$ENV{SOURCE_DATE_EPOCH} = $SOURCE_DATE_EPOCH;
|
|
|
|
print_step("Configuration");
|
|
print "repo_root: $repo_root\n";
|
|
print "pkg_dir: $pkg_dir\n";
|
|
print "work_dir: $work_dir\n";
|
|
print "result_dir: $result_dir\n";
|
|
print "log_dir: $log_dir\n";
|
|
print "mock_cfg: $mock_cfg\n";
|
|
print "arch: $arch\n";
|
|
print "version: $version\n";
|
|
print "go_repo: $go_repo\n";
|
|
print "go_ref: $go_ref\n";
|
|
print "skip_install: $skip_install\n";
|
|
|
|
make_path($result_dir);
|
|
make_path($log_dir);
|
|
|
|
print_step("Stage build environment");
|
|
remove_tree($work_dir) if -d $work_dir;
|
|
make_path($work_dir);
|
|
|
|
# Unique per run (nested under the run/target-scoped --work-dir) so concurrent builds -- e.g.
|
|
# parallel EL targets on one host -- don't wipe each other. (Was a shared
|
|
# /var/tmp/xcat-rpmbuild-goconserver, which collided under parallelism.)
|
|
my $rpmbuild_top = "$work_dir/rpmbuild";
|
|
remove_tree($rpmbuild_top) if -d $rpmbuild_top;
|
|
for my $d (qw(BUILD BUILDROOT RPMS SOURCES SPECS SRPMS)) {
|
|
make_path("$rpmbuild_top/$d");
|
|
}
|
|
|
|
print_step("Clone goconserver source");
|
|
my $src_dir = "$work_dir/goconserver-src";
|
|
# Fetch the exact pinned ref (a SHA, or a branch/tag). `git clone --branch` rejects a raw SHA, so
|
|
# init + shallow fetch the one object + checkout it -- reproducible and immutable, never "latest
|
|
# master". (xcat2/goconserver has allowReachableSHA1InWant, so fetching a master-reachable SHA works.)
|
|
my $clone_log = sh_quote("$log_dir/git-clone.log");
|
|
run("git init -q " . sh_quote($src_dir) . " >$clone_log 2>&1");
|
|
run("git -C " . sh_quote($src_dir) . " remote add origin " . sh_quote($go_repo) . " >>$clone_log 2>&1");
|
|
run("git -C " . sh_quote($src_dir) . " fetch --depth 1 origin " . sh_quote($go_ref) . " >>$clone_log 2>&1");
|
|
run("git -C " . sh_quote($src_dir) . " checkout -q FETCH_HEAD >>$clone_log 2>&1");
|
|
|
|
# etcd storage backend has broken deps with modern Go modules;
|
|
# xCAT only uses file storage, so remove etcd before building.
|
|
unlink "$src_dir/storage/etcd.go";
|
|
remove_tree("$src_dir/storage/etcd") if -d "$src_dir/storage/etcd";
|
|
|
|
print_step("Initialize Go modules");
|
|
$ENV{GOPATH} = "$work_dir/gopath";
|
|
$ENV{GOCACHE} = "$work_dir/gocache";
|
|
$ENV{GOMODCACHE} = "$work_dir/gomodcache";
|
|
$ENV{CGO_ENABLED} = '0';
|
|
|
|
# The archived github.com/kr/pty sets SysProcAttr.Ctty to the parent-side fd,
|
|
# which modern Go's os/exec rejects with "Setctty set but Ctty not valid in
|
|
# child". Replace it with the API-identical maintained fork creack/pty.
|
|
run("cd " . sh_quote($src_dir) . " && " .
|
|
"go mod init github.com/xcat2/goconserver && " .
|
|
"go mod edit -replace github.com/kr/pty=github.com/creack/pty\@v1.1.21 && " .
|
|
"go mod tidy" .
|
|
" >" . sh_quote("$log_dir/go-mod.log") . " 2>&1");
|
|
|
|
print_step("Build goconserver binaries");
|
|
my $go_build_dir = "$work_dir/bin";
|
|
make_path($go_build_dir);
|
|
|
|
my $ldflags = "-X main.Version=$version";
|
|
|
|
run("cd " . sh_quote($src_dir) . " && " .
|
|
"go build -trimpath -buildvcs=false -ldflags " . sh_quote($ldflags) .
|
|
" -o " . sh_quote("$go_build_dir/goconserver") . " goconserver.go" .
|
|
" >" . sh_quote("$log_dir/go-build-server.log") . " 2>&1");
|
|
|
|
run("cd " . sh_quote($src_dir) . " && " .
|
|
"go build -trimpath -buildvcs=false -ldflags " . sh_quote($ldflags) .
|
|
" -o " . sh_quote("$go_build_dir/congo") . " cmd/congo.go" .
|
|
" >" . sh_quote("$log_dir/go-build-client.log") . " 2>&1");
|
|
|
|
die "goconserver binary not built\n" if !-x "$go_build_dir/goconserver";
|
|
die "congo binary not built\n" if !-x "$go_build_dir/congo";
|
|
|
|
print_step("Create source tarball");
|
|
my $payload_dir = "$work_dir/goconserver-$version";
|
|
make_path("$payload_dir/usr/bin");
|
|
make_path("$payload_dir/usr/lib/systemd/system");
|
|
make_path("$payload_dir/etc/goconserver");
|
|
|
|
copy("$go_build_dir/goconserver", "$payload_dir/usr/bin/goconserver")
|
|
or die "copy goconserver: $!\n";
|
|
copy("$go_build_dir/congo", "$payload_dir/usr/bin/congo")
|
|
or die "copy congo: $!\n";
|
|
chmod 0755, "$payload_dir/usr/bin/goconserver";
|
|
chmod 0755, "$payload_dir/usr/bin/congo";
|
|
|
|
write_file("$payload_dir/usr/lib/systemd/system/goconserver.service", <<'SERVICE');
|
|
[Unit]
|
|
Description=goconserver console server
|
|
After=network.target
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStart=/usr/bin/goconserver
|
|
Restart=on-failure
|
|
StateDirectory=goconserver
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
SERVICE
|
|
|
|
# The goconserver binary parses server.conf as YAML. Ship a VALID YAML default: the old INI-style
|
|
# ([server]\nhost = ...) is read by the YAML parser as a sequence -> `panic: cannot unmarshal !!seq into
|
|
# common.ServerConfig` at startup -> systemd rate-limits the service to `failed`. On an xCAT MN,
|
|
# xCAT::Goconserver.pm overwrites this with a cert-enabled config, so this default only has to PARSE and
|
|
# start (no SSL here -- the xcat certs don't exist until xCAT is configured). Keys/ports mirror the schema
|
|
# xCAT itself writes (api 12429, console 12430).
|
|
write_file("$payload_dir/etc/goconserver/server.conf", <<'CONF');
|
|
global:
|
|
host: 0.0.0.0
|
|
logfile: /var/log/goconserver/server.log
|
|
api:
|
|
port: 12429
|
|
console:
|
|
datadir: /var/lib/goconserver/
|
|
port: 12430
|
|
log_timestamp: true
|
|
CONF
|
|
|
|
my $tarball = "$rpmbuild_top/SOURCES/goconserver-$version.tar.gz";
|
|
run("tar --sort=name --owner=0 --group=0 --mtime=\@$SOURCE_DATE_EPOCH" .
|
|
" -C " . sh_quote($work_dir) . " -czf " . sh_quote($tarball) .
|
|
" goconserver-$version");
|
|
|
|
print_step("Create spec and build RPM");
|
|
my $spec_content = <<"SPEC";
|
|
Name: goconserver
|
|
Version: $version
|
|
Release: 4.el$rel$release_suffix
|
|
Summary: Console server written in Go for xCAT
|
|
License: EPL-1.0
|
|
URL: https://github.com/xcat2/goconserver
|
|
BuildArch: $arch
|
|
|
|
Source0: goconserver-%{version}.tar.gz
|
|
|
|
%description
|
|
goconserver is a scalable console server written in Go. It provides
|
|
console logging and management for xCAT cluster nodes.
|
|
|
|
%prep
|
|
%setup -n goconserver-%{version}
|
|
|
|
%install
|
|
mkdir -p %{buildroot}/usr/bin
|
|
mkdir -p %{buildroot}/usr/lib/systemd/system
|
|
mkdir -p %{buildroot}/etc/goconserver
|
|
mkdir -p %{buildroot}/var/log/goconserver
|
|
mkdir -p %{buildroot}/var/lib/goconserver
|
|
|
|
install -m 755 usr/bin/goconserver %{buildroot}/usr/bin/goconserver
|
|
install -m 755 usr/bin/congo %{buildroot}/usr/bin/congo
|
|
install -m 644 usr/lib/systemd/system/goconserver.service %{buildroot}/usr/lib/systemd/system/goconserver.service
|
|
install -m 644 etc/goconserver/server.conf %{buildroot}/etc/goconserver/server.conf
|
|
|
|
%files
|
|
/usr/bin/goconserver
|
|
/usr/bin/congo
|
|
/usr/lib/systemd/system/goconserver.service
|
|
%config(noreplace) /etc/goconserver/server.conf
|
|
%dir /var/log/goconserver
|
|
%dir /var/lib/goconserver
|
|
|
|
%changelog
|
|
* Thu Jul 23 2026 xCAT build - 0.3.3-4.el10
|
|
- Ship /etc/goconserver/server.conf in YAML (the format the goconserver binary parses) instead of the
|
|
old INI [server] style, which the YAML parser reads as a sequence -> panic (cannot unmarshal !!seq) at
|
|
startup -> systemd rate-limits the service to failed before xCAT can convert the config. Fixes console
|
|
provisioning (makegocons) on the management node.
|
|
* Mon Jun 08 2026 xCAT EL10 build - 0.3.3-2.el10
|
|
- Replace archived github.com/kr/pty with github.com/creack/pty to fix
|
|
"Setctty set but Ctty not valid in child" console fork failure on modern Go.
|
|
SPEC
|
|
|
|
my $spec_file = "$rpmbuild_top/SPECS/goconserver.spec";
|
|
write_file($spec_file, $spec_content);
|
|
|
|
run(
|
|
"rpmbuild --define " . sh_quote("_topdir $rpmbuild_top") .
|
|
" --define " . sh_quote("use_source_date_epoch_as_buildtime 1") .
|
|
" --define " . sh_quote("clamp_mtime_to_source_date_epoch 1") .
|
|
" --define " . sh_quote("_buildhost xcat-build") .
|
|
" -ba " . sh_quote($spec_file) .
|
|
" >" . sh_quote("$log_dir/rpmbuild.log") . " 2>&1"
|
|
);
|
|
|
|
print_step("Collect results");
|
|
for my $rpm (glob("$rpmbuild_top/RPMS/*/*.rpm"), glob("$rpmbuild_top/SRPMS/*.rpm")) {
|
|
my $dest = "$result_dir/" . basename($rpm);
|
|
copy($rpm, $dest) or die "Failed to copy $rpm to $dest: $!\n";
|
|
print "Copied: $dest\n";
|
|
}
|
|
|
|
if (!$skip_install) {
|
|
print_step("Install and smoke test");
|
|
my @built = glob("$rpmbuild_top/RPMS/$arch/goconserver-*.rpm");
|
|
die "No arch RPM found\n" if !@built;
|
|
my $main_rpm = $built[0];
|
|
|
|
run("dnf -y install " . sh_quote($main_rpm) .
|
|
" >" . sh_quote("$log_dir/dnf-install.log") . " 2>&1");
|
|
|
|
die "Missing /usr/bin/goconserver\n" if !-x '/usr/bin/goconserver';
|
|
die "Missing /usr/bin/congo\n" if !-x '/usr/bin/congo';
|
|
|
|
my $rc_help = run_rc("goconserver -h >" . sh_quote("$log_dir/smoke-help.log") . " 2>&1");
|
|
die "goconserver -h failed (rc=$rc_help)\n" if $rc_help > 1;
|
|
|
|
my $rc_congo = run_rc("congo -h >" . sh_quote("$log_dir/smoke-congo.log") . " 2>&1");
|
|
die "congo -h failed (rc=$rc_congo)\n" if $rc_congo > 1;
|
|
|
|
print "Smoke tests passed.\n";
|
|
}
|
|
|
|
print_step("Completed");
|
|
print "Results in: $result_dir\n";
|
|
exit 0;
|
|
|
|
sub usage {
|
|
return <<"USAGE";
|
|
Usage: $0 [options]
|
|
|
|
Build goconserver RPM from source.
|
|
|
|
Options:
|
|
--work-dir PATH Working directory (default: /tmp/goconserver-mockbuild)
|
|
--mock-cfg NAME Mock config name (auto-detected if omitted)
|
|
--mock-uniqueext STR Mock uniqueext value (for compatibility with mockbuild-all.pl)
|
|
--result-dir PATH Output directory for RPMs
|
|
--log-dir PATH Output directory for logs
|
|
--skip-install Skip dnf install + smoke tests
|
|
--version VER Version string (default: 0.3.3)
|
|
--go-repo URL Git repo URL (default: github.com/xcat2/goconserver)
|
|
--go-ref REF Git ref to build (default: master)
|
|
--build-timestamp EPOCH SOURCE_DATE_EPOCH for deterministic builds
|
|
USAGE
|
|
}
|
|
|
|
sub print_step {
|
|
my ($msg) = @_;
|
|
print "\n== $msg ==\n";
|
|
}
|
|
|
|
sub sh_quote {
|
|
my ($s) = @_;
|
|
$s = '' if !defined $s;
|
|
$s =~ s/'/'"'"'/g;
|
|
return "'$s'";
|
|
}
|
|
|
|
sub run {
|
|
my ($cmd) = @_;
|
|
print "+ $cmd\n";
|
|
my $rc = system($cmd);
|
|
if ($rc != 0) {
|
|
my $exit = $rc == -1 ? 255 : ($rc >> 8);
|
|
die "Command failed (rc=$exit): $cmd\n";
|
|
}
|
|
}
|
|
|
|
sub run_rc {
|
|
my ($cmd) = @_;
|
|
print "+ $cmd\n";
|
|
my $rc = system($cmd);
|
|
return $rc == -1 ? 255 : ($rc >> 8);
|
|
}
|
|
|
|
sub capture {
|
|
my ($cmd) = @_;
|
|
my $out = `$cmd`;
|
|
chomp $out;
|
|
return $out;
|
|
}
|
|
|
|
sub write_file {
|
|
my ($path, $content) = @_;
|
|
open my $fh, '>', $path or die "Cannot write $path: $!\n";
|
|
print $fh $content;
|
|
close $fh;
|
|
}
|
|
|
|
sub resolve_mock_cfg {
|
|
my ($os_id, $rel, $arch) = @_;
|
|
my %short_forms = (almalinux => 'alma', rocky => 'rocky');
|
|
my $candidate = "${os_id}+epel-${rel}-${arch}";
|
|
my $rc = system("mock -r " . sh_quote($candidate) . " --print-root-path >/dev/null 2>&1");
|
|
return $candidate if $rc == 0;
|
|
if (exists $short_forms{$os_id}) {
|
|
$candidate = "$short_forms{$os_id}+epel-${rel}-${arch}";
|
|
$rc = system("mock -r " . sh_quote($candidate) . " --print-root-path >/dev/null 2>&1");
|
|
return $candidate if $rc == 0;
|
|
}
|
|
return "${os_id}+epel-${rel}-${arch}";
|
|
}
|