mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-09-30 14:55:16 +00:00
Merge pull request #7868 from VersatusHPC/test/r26-otherpkgs-upgrade-behavior
test(otherpkgs): exercise repository-scoped upgrades
This commit is contained in:
Daniel Hilst
GitHub
@@ -6,7 +6,11 @@ jobs:
|
||||
timeout-minutes: 60
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- name: Refresh package indexes
|
||||
run: sudo apt-get update
|
||||
- name: Install dependencies
|
||||
run: sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests bats build-essential fakeroot reprepro devscripts debhelper libcapture-tiny-perl libfile-slurper-perl libjson-perl libparallel-forkmanager-perl libsoap-lite-perl libdbi-perl libcgi-pm-perl quilt openssh-server dpkg looptools genometools software-properties-common
|
||||
run: sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests bats bubblewrap build-essential fakeroot reprepro devscripts debhelper libcapture-tiny-perl libfile-slurper-perl libjson-perl libparallel-forkmanager-perl libsoap-lite-perl libdbi-perl libcgi-pm-perl quilt openssh-server dpkg looptools genometools software-properties-common
|
||||
- name: Enable postscript test namespaces
|
||||
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
|
||||
- name: Run tests
|
||||
run: perl github_action_xcat_test.pl
|
||||
|
||||
@@ -19,3 +19,14 @@ commands so tests cannot write to the host.
|
||||
Extraction helpers in `helpers/shell_source.bash` are only for legacy code that
|
||||
cannot safely be sourced yet. Do not add Perl `.t` tests that grep shell source
|
||||
when the behavior can be tested with BATS.
|
||||
|
||||
## Postscript sandbox prerequisites
|
||||
|
||||
`otherpkgs_upgrade_scope.bats` runs the complete postscript in a Linux filesystem
|
||||
sandbox because it writes to `/etc/yum.repos.d`. It requires Bubblewrap, Bash,
|
||||
GNU core utilities, and permission to create user namespaces. The CI workflow
|
||||
installs Bubblewrap and enables those namespaces.
|
||||
|
||||
Missing prerequisites fail this test without stopping unrelated test files.
|
||||
Non-Linux hosts report a skip. Set `TMPDIR` to a writable, executable filesystem
|
||||
if the default temporary directory is mounted with `noexec`.
|
||||
|
||||
@@ -0,0 +1,239 @@
|
||||
#!/usr/bin/env bats
|
||||
|
||||
load 'helpers/shell_source'
|
||||
|
||||
setup()
|
||||
{
|
||||
[ "$(uname -s)" = Linux ] || skip 'otherpkgs filesystem isolation requires Linux'
|
||||
local utility executable
|
||||
local utilities=(bash sh basename dirname cat cp expr grep ls mkdir rm uname wc)
|
||||
local bwrap
|
||||
bwrap=$(PATH=/usr/bin:/bin type -P bwrap) || {
|
||||
echo 'Install bubblewrap to run the otherpkgs test' >&2
|
||||
return 1
|
||||
}
|
||||
postscripts=$(repo_path xCAT/postscripts)
|
||||
fixture="$BATS_TEST_TMPDIR/fixture"
|
||||
mkdir -p "$fixture/bin"
|
||||
sandbox=(env -i PATH=/usr/bin:/bin LC_ALL=C "$bwrap"
|
||||
--unshare-all --die-with-parent --new-session
|
||||
--ro-bind / / --tmpfs /etc --tmpfs /usr/bin --tmpfs /tmp
|
||||
--proc /proc --dev /dev --setenv PATH /usr/bin --setenv LC_ALL C)
|
||||
if PATH=/usr/bin:/bin type -P coreutils >/dev/null; then
|
||||
utilities+=(coreutils)
|
||||
fi
|
||||
for utility in "${utilities[@]}"; do
|
||||
executable=$(PATH=/usr/bin:/bin type -P "$utility") || {
|
||||
echo "Required utility is unavailable: $utility" >&2
|
||||
return 1
|
||||
}
|
||||
sandbox+=(--ro-bind "$executable" "/usr/bin/$utility")
|
||||
done
|
||||
run "${sandbox[@]}" /usr/bin/sh -c 'test ! -e /etc/os-release'
|
||||
if [ "$status" -ne 0 ]; then
|
||||
echo "Cannot isolate otherpkgs: $output" >&2
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
run_case()
|
||||
{
|
||||
local manager=$1 scenario=$2
|
||||
local verbose='' remote='' mounted='' repoonly='' multiple='' empty=''
|
||||
local upgrade_status=0 install_status=0
|
||||
case "$scenario" in
|
||||
http) verbose=1; remote=1 ;;
|
||||
mounted) mounted=1 ;;
|
||||
upgrade_failure) upgrade_status=17; verbose=1 ;;
|
||||
install_failure) install_status=23; verbose=1 ;;
|
||||
repoonly) repoonly=1; remote=1 ;;
|
||||
multiple) multiple=1; verbose=1 ;;
|
||||
empty) remote=1; empty=1 ;;
|
||||
esac
|
||||
printf '#!/usr/bin/sh\nexit 0\n' >"$fixture/bin/logger"
|
||||
printf '#!/usr/bin/sh\nexit 1\n' >"$fixture/bin/dpkg"
|
||||
printf '#!/usr/bin/sh\n[ "$*" = --version ]\n' >"$fixture/bin/rpm"
|
||||
if [ "$mounted" ]; then
|
||||
printf '#!/usr/bin/sh\nprintf "%%s\\n" "package-server:/install on /install type nfs (rw)"\n' >"$fixture/bin/mount"
|
||||
else
|
||||
printf '#!/usr/bin/sh\nexit 0\n' >"$fixture/bin/mount"
|
||||
fi
|
||||
cat >"$fixture/bin/$manager" <<'SH'
|
||||
#!/usr/bin/sh
|
||||
printf '%s\t' "${0##*/}" "SCOPE_ENV=${SCOPE_ENV:-}" "$@" >> /tmp/fixture/commands
|
||||
printf '\n' >> /tmp/fixture/commands
|
||||
sequence=$(wc -l < /tmp/fixture/commands)
|
||||
mkdir "/tmp/fixture/repos.$sequence"
|
||||
cp /etc/yum.repos.d/*.repo "/tmp/fixture/repos.$sequence/" 2>/dev/null || :
|
||||
for argument do
|
||||
case "$argument" in
|
||||
upgrade) printf '%s\n' upgrade-result; exit "$UPGRADE_STATUS" ;;
|
||||
install) printf '%s\n' install-result; exit "$INSTALL_STATUS" ;;
|
||||
esac
|
||||
done
|
||||
exit 0
|
||||
SH
|
||||
chmod +x "$fixture/bin/"*
|
||||
|
||||
local otherpkgdir=/install/other packages=alpha/tool-one,beta/tool-two
|
||||
local list_count=1
|
||||
[ ! "$remote" ] || otherpkgdir=https://packages.example.invalid/extra,/install/other
|
||||
[ ! "$empty" ] || packages=
|
||||
[ ! "$multiple" ] || list_count=2
|
||||
local command=("${sandbox[@]}"
|
||||
--bind "$fixture" /tmp/fixture
|
||||
--ro-bind "$postscripts" /tmp/postscripts --chdir /tmp/fixture)
|
||||
local tool
|
||||
for tool in logger dpkg rpm mount "$manager"; do
|
||||
command+=(--ro-bind "$fixture/bin/$tool" "/usr/bin/$tool")
|
||||
done
|
||||
command+=(
|
||||
--setenv OSVER rhel9 --setenv ARCH x86_64 --setenv UPDATENODE 1
|
||||
--setenv NFSSERVER package-server --setenv HTTPPORT 80
|
||||
--setenv INSTALLDIR /install --setenv OTHERPKGDIR "$otherpkgdir"
|
||||
--setenv OTHERPKGS_INDEX "$list_count" --setenv OTHERPKGS1 "$packages"
|
||||
--setenv ENVLIST1 SCOPE_ENV=first --setenv VERBOSE "$verbose"
|
||||
--setenv UPGRADE_STATUS "$upgrade_status" --setenv INSTALL_STATUS "$install_status")
|
||||
if [ "$multiple" ]; then
|
||||
command+=(--setenv OTHERPKGS2 gamma/tool-three --setenv ENVLIST2 SCOPE_ENV=second)
|
||||
fi
|
||||
local runner
|
||||
runner=$(cat <<'SH'
|
||||
/usr/bin/bash /tmp/postscripts/otherpkgs "$@"
|
||||
status=$?
|
||||
mkdir /tmp/fixture/final-repos
|
||||
cp /etc/yum.repos.d/*.repo /tmp/fixture/final-repos/ 2>/dev/null || :
|
||||
exit "$status"
|
||||
SH
|
||||
)
|
||||
command+=(/usr/bin/sh -c "$runner" otherpkgs-test)
|
||||
[ ! "$repoonly" ] || command+=(--repoonly)
|
||||
|
||||
run "${command[@]}"
|
||||
if [ "$status" -ne "$((upgrade_status + install_status))" ]; then
|
||||
echo "$output" >&2
|
||||
return 1
|
||||
fi
|
||||
[ -f "$fixture/commands" ]
|
||||
|
||||
local line operand sequence=0
|
||||
local arguments=() paths=()
|
||||
: >"$fixture/transactions"
|
||||
while IFS= read -r line; do
|
||||
sequence=$((sequence + 1))
|
||||
IFS=$'\t' read -r -a arguments <<<"$line"
|
||||
operand=
|
||||
for operand in "${arguments[@]:2}"; do
|
||||
[[ "$operand" = -* ]] || break
|
||||
done
|
||||
case "$operand" in clean|list) continue ;; esac
|
||||
printf '%s\n' "$line" >>"$fixture/transactions"
|
||||
paths=(alpha beta)
|
||||
[ ! "$empty" ] || paths=()
|
||||
if [ "$multiple" ] && [ "${arguments[1]}" = SCOPE_ENV=second ]; then
|
||||
paths=(gamma)
|
||||
fi
|
||||
check_repositories "$fixture/repos.$sequence" "${paths[@]}"
|
||||
done <"$fixture/commands"
|
||||
|
||||
: >"$fixture/expected-transactions"
|
||||
: >"$fixture/expected-printed"
|
||||
if [ ! "$repoonly" ]; then
|
||||
expect_transaction first -y '--disablerepo=*' '--enablerepo=xcat-otherpkgs*' upgrade
|
||||
if [ ! "$empty" ]; then
|
||||
expect_transaction first -y install tool-one tool-two
|
||||
fi
|
||||
if [ "$multiple" ]; then
|
||||
expect_transaction second -y '--disablerepo=*' '--enablerepo=xcat-otherpkgs*' upgrade
|
||||
expect_transaction second -y install tool-three
|
||||
fi
|
||||
fi
|
||||
diff -u "$fixture/expected-transactions" "$fixture/transactions"
|
||||
|
||||
: >"$fixture/printed"
|
||||
while IFS= read -r line; do
|
||||
[[ "$line" = SCOPE_ENV=* ]] || continue
|
||||
read -r -a arguments <<<"$line"
|
||||
printf '%s\t' "${arguments[@]}" >>"$fixture/printed"
|
||||
printf '\n' >>"$fixture/printed"
|
||||
done <<<"$output"
|
||||
diff -u "$fixture/expected-printed" "$fixture/printed"
|
||||
|
||||
paths=(alpha beta)
|
||||
[ ! "$empty" ] || paths=()
|
||||
[ ! "$multiple" ] || paths=(gamma)
|
||||
check_repositories "$fixture/final-repos" "${paths[@]}"
|
||||
if [ "$verbose" ] && [ ! "$repoonly" ]; then
|
||||
[[ $'\n'"$output"$'\n' = *$'\nupgrade-result\n'* ]]
|
||||
if [ ! "$empty" ]; then
|
||||
[[ $'\n'"$output"$'\n' = *$'\ninstall-result\n'* ]]
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
expect_transaction()
|
||||
{
|
||||
local label=$1
|
||||
shift
|
||||
printf '%s\t' "$manager" "SCOPE_ENV=$label" "$@" >>"$fixture/expected-transactions"
|
||||
printf '\n' >>"$fixture/expected-transactions"
|
||||
if [ "$verbose" ]; then
|
||||
printf '%s\t' "SCOPE_ENV=$label" "$manager" "$@" >>"$fixture/expected-printed"
|
||||
printf '\n' >>"$fixture/expected-printed"
|
||||
fi
|
||||
}
|
||||
|
||||
check_repositories()
|
||||
{
|
||||
local directory=$1
|
||||
shift
|
||||
local base=http://package-server:80 index=0 pkgpath file
|
||||
[ ! "$mounted" ] || base=file://
|
||||
{
|
||||
printf '%s\t%s\t1\t0\n' xCAT-rhel9-path0 "$base/install/rhel9/x86_64/BaseOS"
|
||||
printf '%s\t%s\t1\t0\n' xCAT-rhel9-path1 "$base/install/rhel9/x86_64/AppStream"
|
||||
if [ "$remote" ]; then
|
||||
printf '%s\t%s\t1\t0\n' xcat-otherpkgs0 https://packages.example.invalid/extra
|
||||
index=1
|
||||
fi
|
||||
for pkgpath do
|
||||
printf '%s\t%s\t1\t0\n' "xcat-otherpkgs$index" "$base/install/other/$pkgpath"
|
||||
index=$((index + 1))
|
||||
done
|
||||
} | LC_ALL=C sort >"$fixture/expected-repos"
|
||||
: >"$fixture/repos"
|
||||
for file in "$directory/"*.repo; do
|
||||
[ -f "$file" ] || continue
|
||||
awk '
|
||||
/^\[[^]]+\]$/ { sections = sections substr($0, 2, length($0) - 2) "\t" }
|
||||
/^(baseurl|enabled|gpgcheck)=/ {
|
||||
key = substr($0, 1, index($0, "=") - 1)
|
||||
value = substr($0, index($0, "=") + 1)
|
||||
sub(/[[:space:]]+$/, "", value)
|
||||
values[key] = values[key] value "\t"
|
||||
}
|
||||
END {
|
||||
record = sections values["baseurl"] values["enabled"] values["gpgcheck"]
|
||||
sub(/\t$/, "", record)
|
||||
print record
|
||||
}
|
||||
' "$file" >>"$fixture/repos"
|
||||
done
|
||||
LC_ALL=C sort "$fixture/repos" >"$fixture/sorted-repos"
|
||||
diff -u "$fixture/expected-repos" "$fixture/sorted-repos"
|
||||
}
|
||||
|
||||
@test "dnf: HTTP and local repositories" { run_case dnf http; }
|
||||
@test "dnf: mounted repositories" { run_case dnf mounted; }
|
||||
@test "dnf: upgrade failure" { run_case dnf upgrade_failure; }
|
||||
@test "dnf: install failure" { run_case dnf install_failure; }
|
||||
@test "dnf: repository-only mode" { run_case dnf repoonly; }
|
||||
@test "dnf: separate package lists" { run_case dnf multiple; }
|
||||
@test "dnf: remote repository without installs" { run_case dnf empty; }
|
||||
@test "yum: HTTP and local repositories" { run_case yum http; }
|
||||
@test "yum: mounted repositories" { run_case yum mounted; }
|
||||
@test "yum: upgrade failure" { run_case yum upgrade_failure; }
|
||||
@test "yum: install failure" { run_case yum install_failure; }
|
||||
@test "yum: repository-only mode" { run_case yum repoonly; }
|
||||
@test "yum: separate package lists" { run_case yum multiple; }
|
||||
@test "yum: remote repository without installs" { run_case yum empty; }
|
||||
@@ -1,58 +0,0 @@
|
||||
#!/usr/bin/env perl
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use FindBin;
|
||||
use File::Spec;
|
||||
use Test::More;
|
||||
|
||||
my $repo_root = File::Spec->catdir( $FindBin::Bin, '..', '..' );
|
||||
my $script_path = File::Spec->catfile( $repo_root, 'xCAT/postscripts/otherpkgs' );
|
||||
|
||||
plan skip_all => "$script_path not found" unless -r $script_path;
|
||||
|
||||
open( my $fh, '<', $script_path ) or die "Unable to read $script_path: $!";
|
||||
my $script = do { local $/; <$fh> };
|
||||
close($fh);
|
||||
|
||||
# The postscript writes its repositories as [xcat-otherpkgs<index>]. The upgrade
|
||||
# below is scoped with --enablerepo=xcat-otherpkgs*, so the two have to agree or
|
||||
# the upgrade silently matches no repository at all.
|
||||
like(
|
||||
$script,
|
||||
qr/echo\s+"\[xcat-otherpkgs\$urlrepoindex\]"/,
|
||||
'remote repositories are still defined as xcat-otherpkgs<index>'
|
||||
);
|
||||
like(
|
||||
$script,
|
||||
qr/echo\s+"\[xcat-otherpkgs\$localrepoindex\]"/,
|
||||
'local repositories are still defined as xcat-otherpkgs<index>'
|
||||
);
|
||||
|
||||
# Both the verbose echo and the command actually executed must carry the same
|
||||
# scoping, otherwise verbose output reports a command that was never run.
|
||||
my @scoped = $script =~ /\$yumcmd\s+-y\s+--disablerepo=\*\s+--enablerepo=xcat-otherpkgs\*\s+upgrade/g;
|
||||
is(
|
||||
scalar(@scoped),
|
||||
2,
|
||||
'the yum/dnf upgrade is scoped to the xcat-otherpkgs repositories in both the verbose echo and the executed command'
|
||||
);
|
||||
|
||||
# Counted rather than matched with unlike(), so that a failure reports the count
|
||||
# instead of dumping the whole postscript into the test output.
|
||||
my @unscoped = $script =~ /(\$yumcmd\s+-y\s+upgrade)/g;
|
||||
is(
|
||||
scalar(@unscoped),
|
||||
0,
|
||||
'no unscoped yum/dnf upgrade remains, which would also apply unrelated distribution updates'
|
||||
);
|
||||
|
||||
# The install path must keep every repository enabled so that dependencies of
|
||||
# the otherpkgs packages can still be resolved from the distribution.
|
||||
like(
|
||||
$script,
|
||||
qr/\$yumcmd\s+-y\s+install\s+\$repo_pkgs/,
|
||||
'the package install path is left unscoped so dependencies still resolve'
|
||||
);
|
||||
|
||||
done_testing();
|
||||
Reference in New Issue
Block a user