Skip to content

tests: pass on listener presets to stackablectl #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

tests: pass on listener presets to stackablectl #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# on Darwin (macOS), but doesn't seem to actually be necessary beyond
# production hardening.
fakeroot =
if self.buildPlatform.isDarwin then
if self.stdenv.buildPlatform.isDarwin then
self.writeScriptBin "fakeroot" ''exec "$@"''
else
super.fakeroot;
Expand All @@ -14,7 +14,7 @@
# (non-Nix build tools like Tilt, as well as the container composition scripts)
, pkgsLocal ? import nixpkgs { inherit overlays; }
# Default to building for the local CPU architecture
, targetArch ? pkgsLocal.hostPlatform.linuxArch
, targetArch ? pkgsLocal.stdenv.hostPlatform.linuxArch
, targetSystem ? "${targetArch}-unknown-linux-gnu"
, pkgsTarget ? import nixpkgs {
inherit overlays;
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 16 additions & 2 deletions scripts/run-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ def parse_args(argv: list[str]) -> argparse.Namespace:
default=os.path.join("tests", "_work"),
)

parser.add_argument(
"--listener-class-preset",
help="Choose the ListenerClass preset",
type=str,
required=False,
)

return parser.parse_args(argv)


Expand Down Expand Up @@ -285,7 +292,9 @@ def release_file(
logging.error(f"Failed to delete patched release file: {release_file}")


def maybe_install_release(skip_release: bool, release_file: str) -> None:
def maybe_install_release(
skip_release: bool, release_file: str, listener_class_preset: str
) -> None:
if skip_release:
logging.debug("Skip release installation")
return
Expand All @@ -296,6 +305,11 @@ def maybe_install_release(skip_release: bool, release_file: str) -> None:
"install",
"--release-file",
release_file,
*(
["--listener-class-preset", listener_class_preset]
if listener_class_preset
else []
),
"tests",
]
logging.debug(f"Running : {stackablectl_cmd}")
Expand Down Expand Up @@ -436,7 +450,7 @@ def main(argv) -> int:
have_requirements()
gen_tests(opts.test_suite, opts.namespace, opts.work_dir)
with release_file(opts.operator, opts.skip_operator) as f:
maybe_install_release(opts.skip_release, f)
maybe_install_release(opts.skip_release, f, opts.listener_class_preset)
if opts.skip_tests:
logging.info("Skip running tests.")
else:
Expand Down