From bbf483c46e007036475674a60c5fbd8e5a3e6b32 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 3 May 2022 19:38:28 +1000 Subject: [PATCH 1/2] nixos/release: add podman, oci-containers.podman to tested --- nixos/release-combined.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index fd8a39cfb92b..7f81ca1c69b8 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -132,12 +132,14 @@ in rec { # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 #(onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") + (onSystems ["x86_64-linux"] "nixos.tests.oci-containers.podman") (onFullSupported "nixos.tests.openssh") (onFullSupported "nixos.tests.pantheon") (onFullSupported "nixos.tests.php.fpm") (onFullSupported "nixos.tests.php.httpd") (onFullSupported "nixos.tests.php.pcre") (onFullSupported "nixos.tests.plasma5") + (onSystems ["x86_64-linux"] "nixos.tests.podman") (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd") (onFullSupported "nixos.tests.predictable-interface-names.predictable") (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd") From 825078447ac48ed4912e609d671d1f037a1e813c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 3 May 2022 19:38:29 +1000 Subject: [PATCH 2/2] podman: add oci-containers.podman to passthru.tests --- pkgs/applications/virtualization/podman/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 1f596c609062..89568129918d 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -88,6 +88,7 @@ buildGoModule rec { podman-tls-ghostunnel podman-dnsname ; + oci-containers-podman = nixosTests.oci-containers.podman; }; meta = with lib; {