diff --git a/default.nix b/default.nix index 071adcb2..e467de8e 100644 --- a/default.nix +++ b/default.nix @@ -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; @@ -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; diff --git a/nix/sources.json b/nix/sources.json index 1b5af204..f79c2cf0 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", - "sha256": "1pxnwzrwcgasascapd6f0l8ricv6dgads3rgz2m45hyny80720cs", + "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "sha256": "0h3gvjbrlkvxhbxpy01n603ixv0pjy19n9kf73rdkchdvqcn70j2", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/9b008d60392981ad674e04016d25619281550a9d.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/a7fc11be66bdfb5cdde611ee5ce381c183da8386.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/scripts/run-tests b/scripts/run-tests index 44f27fca..00639f45 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -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) @@ -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 @@ -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}") @@ -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: