lol

nixosTests.docker-rootless: migrate to runTestOn

Part of #386873

+42 -45
+1 -1
nixos/tests/all-tests.nix
··· 370 370 dnsdist = import ./dnsdist.nix { inherit pkgs runTest; }; 371 371 doas = runTest ./doas.nix; 372 372 docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix; 373 - docker-rootless = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix { }; 373 + docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix; 374 374 docker-registry = handleTest ./docker-registry.nix { }; 375 375 docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { }; 376 376 docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
+41 -44
nixos/tests/docker-rootless.nix
··· 1 1 # This test runs docker and checks if simple container starts 2 + { lib, pkgs, ... }: 3 + { 4 + name = "docker-rootless"; 5 + meta = with pkgs.lib.maintainers; { 6 + maintainers = [ abbradar ]; 7 + }; 2 8 3 - import ./make-test-python.nix ( 4 - { lib, pkgs, ... }: 5 - { 6 - name = "docker-rootless"; 7 - meta = with pkgs.lib.maintainers; { 8 - maintainers = [ abbradar ]; 9 - }; 9 + nodes = { 10 + machine = 11 + { pkgs, ... }: 12 + { 13 + virtualisation.docker.rootless.enable = true; 10 14 11 - nodes = { 12 - machine = 13 - { pkgs, ... }: 14 - { 15 - virtualisation.docker.rootless.enable = true; 16 - 17 - users.users.alice = { 18 - uid = 1000; 19 - isNormalUser = true; 20 - }; 15 + users.users.alice = { 16 + uid = 1000; 17 + isNormalUser = true; 21 18 }; 22 - }; 19 + }; 20 + }; 23 21 24 - testScript = 25 - { nodes, ... }: 26 - let 27 - user = nodes.machine.config.users.users.alice; 28 - sudo = lib.concatStringsSep " " [ 29 - "XDG_RUNTIME_DIR=/run/user/${toString user.uid}" 30 - "DOCKER_HOST=unix:///run/user/${toString user.uid}/docker.sock" 31 - "sudo" 32 - "--preserve-env=XDG_RUNTIME_DIR,DOCKER_HOST" 33 - "-u" 34 - "alice" 35 - ]; 36 - in 37 - '' 38 - machine.wait_for_unit("multi-user.target") 22 + testScript = 23 + { nodes, ... }: 24 + let 25 + user = nodes.machine.config.users.users.alice; 26 + sudo = lib.concatStringsSep " " [ 27 + "XDG_RUNTIME_DIR=/run/user/${toString user.uid}" 28 + "DOCKER_HOST=unix:///run/user/${toString user.uid}/docker.sock" 29 + "sudo" 30 + "--preserve-env=XDG_RUNTIME_DIR,DOCKER_HOST" 31 + "-u" 32 + "alice" 33 + ]; 34 + in 35 + '' 36 + machine.wait_for_unit("multi-user.target") 39 37 40 - machine.succeed("loginctl enable-linger alice") 41 - machine.wait_until_succeeds("${sudo} systemctl --user is-active docker.service") 38 + machine.succeed("loginctl enable-linger alice") 39 + machine.wait_until_succeeds("${sudo} systemctl --user is-active docker.service") 42 40 43 - machine.succeed("tar cv --files-from /dev/null | ${sudo} docker import - scratchimg") 44 - machine.succeed( 45 - "${sudo} docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" 46 - ) 47 - machine.succeed("${sudo} docker ps | grep sleeping") 48 - machine.succeed("${sudo} docker stop sleeping") 49 - ''; 50 - } 51 - ) 41 + machine.succeed("tar cv --files-from /dev/null | ${sudo} docker import - scratchimg") 42 + machine.succeed( 43 + "${sudo} docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" 44 + ) 45 + machine.succeed("${sudo} docker ps | grep sleeping") 46 + machine.succeed("${sudo} docker stop sleeping") 47 + ''; 48 + }