From 18b5bb344424f66c2ef3e7c435fa68f1b75cbd19 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 21 Aug 2026 11:31:04 +0200 Subject: [PATCH 1/2] fix(test-guest): support RPM installs with DNF5 Signed-off-by: Evan Lezar --- nix/test-guest/run.sh | 2 +- tasks/scripts/test-test-guest.sh | 24 ++++++++++++++++++++++++ tasks/test.toml | 7 +++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 tasks/scripts/test-test-guest.sh diff --git a/nix/test-guest/run.sh b/nix/test-guest/run.sh index 68266fcc46..a57b4b210e 100644 --- a/nix/test-guest/run.sh +++ b/nix/test-guest/run.sh @@ -609,7 +609,7 @@ if [ "${#packages[@]}" -gt 0 ] || [ "${#copies[@]}" -gt 0 ]; then ;; rpm) ssh "${ssh_args[@]}" openshell@127.0.0.1 \ - "sudo dnf install -y --nogpgcheck --${quoted_packages}" + "sudo dnf install -y --nogpgcheck${quoted_packages}" ;; esac fi diff --git a/tasks/scripts/test-test-guest.sh b/tasks/scripts/test-test-guest.sh new file mode 100755 index 0000000000..8141f20f3f --- /dev/null +++ b/tasks/scripts/test-test-guest.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +set -euo pipefail + +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" +RUNNER="${ROOT}/nix/test-guest/run.sh" + +if ! grep -Fq \ + '"sudo dnf install -y --nogpgcheck${quoted_packages}"' \ + "${RUNNER}"; then + echo "FAIL: RPM installation must pass package paths directly to dnf" >&2 + exit 1 +fi + +if grep -Fq \ + '"sudo dnf install -y --nogpgcheck --${quoted_packages}"' \ + "${RUNNER}"; then + echo "FAIL: DNF5 rejects the standalone -- before package paths" >&2 + exit 1 +fi + +echo "test-guest focused tests passed" diff --git a/tasks/test.toml b/tasks/test.toml index bef8baf2b5..45bd89bf4c 100644 --- a/tasks/test.toml +++ b/tasks/test.toml @@ -13,6 +13,7 @@ depends = [ "test:install-sh", "test:build-env", "test:packaging-assets", + "test:test-guest", "test:docs-website", ] @@ -33,6 +34,12 @@ run = "tasks/scripts/test-install-sh.sh" run_windows = "echo Skipping test:install-sh: Linux glibc installer tests do not apply on Windows." hide = true +["test:test-guest"] +description = "Run focused Nix test-guest shell tests" +run = "tasks/scripts/test-test-guest.sh" +run_windows = "echo Skipping test:test-guest: Nix test guests do not apply on Windows." +hide = true + ["test:build-env"] description = "Run build-env.sh helper shell tests" run = "tasks/scripts/test-build-env.sh" From deef2721e4f11639ba963040beafa4ed79a6282b Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 21 Aug 2026 12:02:07 +0200 Subject: [PATCH 2/2] fix(test-guest): clarify RPM install arguments Signed-off-by: Evan Lezar --- nix/test-guest/run.sh | 2 +- tasks/scripts/test-test-guest.sh | 24 ------------------------ tasks/test.toml | 7 ------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100755 tasks/scripts/test-test-guest.sh diff --git a/nix/test-guest/run.sh b/nix/test-guest/run.sh index a57b4b210e..c999679492 100644 --- a/nix/test-guest/run.sh +++ b/nix/test-guest/run.sh @@ -609,7 +609,7 @@ if [ "${#packages[@]}" -gt 0 ] || [ "${#copies[@]}" -gt 0 ]; then ;; rpm) ssh "${ssh_args[@]}" openshell@127.0.0.1 \ - "sudo dnf install -y --nogpgcheck${quoted_packages}" + "sudo dnf install -y --nogpgcheck ${quoted_packages}" ;; esac fi diff --git a/tasks/scripts/test-test-guest.sh b/tasks/scripts/test-test-guest.sh deleted file mode 100755 index 8141f20f3f..0000000000 --- a/tasks/scripts/test-test-guest.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -set -euo pipefail - -ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" -RUNNER="${ROOT}/nix/test-guest/run.sh" - -if ! grep -Fq \ - '"sudo dnf install -y --nogpgcheck${quoted_packages}"' \ - "${RUNNER}"; then - echo "FAIL: RPM installation must pass package paths directly to dnf" >&2 - exit 1 -fi - -if grep -Fq \ - '"sudo dnf install -y --nogpgcheck --${quoted_packages}"' \ - "${RUNNER}"; then - echo "FAIL: DNF5 rejects the standalone -- before package paths" >&2 - exit 1 -fi - -echo "test-guest focused tests passed" diff --git a/tasks/test.toml b/tasks/test.toml index 45bd89bf4c..bef8baf2b5 100644 --- a/tasks/test.toml +++ b/tasks/test.toml @@ -13,7 +13,6 @@ depends = [ "test:install-sh", "test:build-env", "test:packaging-assets", - "test:test-guest", "test:docs-website", ] @@ -34,12 +33,6 @@ run = "tasks/scripts/test-install-sh.sh" run_windows = "echo Skipping test:install-sh: Linux glibc installer tests do not apply on Windows." hide = true -["test:test-guest"] -description = "Run focused Nix test-guest shell tests" -run = "tasks/scripts/test-test-guest.sh" -run_windows = "echo Skipping test:test-guest: Nix test guests do not apply on Windows." -hide = true - ["test:build-env"] description = "Run build-env.sh helper shell tests" run = "tasks/scripts/test-build-env.sh"