movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.docker-tools-cross: migrate to runTestOn

Browse source 
Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-02 17:19:19 +02:00
parent d3b5f76505
commit b7a4f78fcb
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 67 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -374,7 +374,7 @@ in
docker-registry = runTest ./docker-registry.nix; docker-registry = runTest ./docker-registry.nix;
docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { }; docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { };
docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix; docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
docker-tools-cross = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix { }; docker-tools-cross = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix;
docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix; docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix;
docling-serve = runTest ./docling-serve.nix; docling-serve = runTest ./docling-serve.nix;
documize = handleTest ./documize.nix { }; documize = handleTest ./documize.nix { };

12
nixos/tests/docker-tools-cross.nix
View file

@ -2,9 +2,8 @@
# tests that _include_ running the result are separate. That way, most people # tests that _include_ running the result are separate. That way, most people
# can run the majority of the test suite without the extra setup. # can run the majority of the test suite without the extra setup.
import ./make-test-python.nix ( { pkgs, ... }:
{ pkgs, ... }: let
let
remoteSystem = remoteSystem =
if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then "x86_64-linux" else "aarch64-linux"; if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then "x86_64-linux" else "aarch64-linux";
@ -37,8 +36,8 @@ import ./make-test-python.nix (
contents = remoteCrossPkgs.hello; contents = remoteCrossPkgs.hello;
}; };
in in
{ {
name = "docker-tools"; name = "docker-tools";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ roberth ]; maintainers = [ roberth ];
@ -80,5 +79,4 @@ import ./make-test-python.nix (
"docker rmi ${hello2.imageName}", "docker rmi ${hello2.imageName}",
) )
''; '';
} }
)