github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-08-09 16:20:59 +00:00
Code Issues Projects Releases Wiki Activity

ci: keep ORAS installer stdout from polluting tarball paths

Browse Source 
When ORAS is not preinstalled, install_oras.sh status messages leak into
the command substitution that captures the cached gperf path, so the
file check fails and CI falls back to a flaky upstream curl that often
times out (exit 28). Redirect installer output to stderr, and harden the
direct-download fallbacks with retries and timeouts.

Fixes: #13560

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
This commit is contained in:
Fabiano Fidêncio
2026-08-07 14:01:11 +02:00
committed by Fabiano Fidêncio
parent bf52ffaf69
commit ff33fc2006
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci/install_libseccomp.sh
View File

@@ -88,10 +88,10 @@ build_and_install_gperf() {
gperf_tarball="${cached_tarball}"
else
echo "ORAS cache download failed, falling back to direct download"
curl -sLO "${gperf_tarball_url}"
curl -fsSL --retry 5 --retry-delay 5 --connect-timeout 30 --max-time 300 -O "${gperf_tarball_url}"
fi
else
curl -sLO "${gperf_tarball_url}"
curl -fsSL --retry 5 --retry-delay 5 --connect-timeout 30 --max-time 300 -O "${gperf_tarball_url}"
fi
tar -xf "${gperf_tarball}"
@@ -108,7 +108,7 @@ build_and_install_gperf() {
build_and_install_libseccomp() {
echo "Build and install libseccomp version ${libseccomp_version}"
mkdir -p "${libseccomp_install_dir}"
curl -sLO "${libseccomp_tarball_url}"
curl -fsSL --retry 5 --retry-delay 5 --connect-timeout 30 --max-time 300 -O "${libseccomp_tarball_url}"
tar -xf "${libseccomp_tarball}"
pushd "libseccomp-${libseccomp_version}"
./configure --prefix="${libseccomp_install_dir}" CFLAGS="${cflags}" --enable-static

6
tools/packaging/scripts/download-with-oras-cache.sh
View File

@@ -58,7 +58,11 @@ ensure_oras_installed() {
if [[ -f "${install_oras_script}" ]]; then
info "Installing ORAS using existing script"
if "${install_oras_script}"; then
# Redirect the install script's stdout to stderr: functions in this
# helper communicate the downloaded tarball path via stdout (captured by
# callers with command substitution), so any stray stdout here would
# corrupt that path.
if "${install_oras_script}" >&2; then
# Verify installation succeeded
if command -v oras &>/dev/null; then
info "ORAS installed successfully"