mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
ci: add nixosTests.simple-container
nixosTests.simple-vm but using an nspawn container
This commit is contained in:
@@ -172,6 +172,7 @@ let
|
||||
rebuildCountByKernel = lib.mapAttrs (
|
||||
kernel: kernelRebuilds: lib.length kernelRebuilds
|
||||
) rebuildsByKernel;
|
||||
rebuildNames = extractPackageNames diffAttrs.rebuilds;
|
||||
in
|
||||
writeText "changed-paths.json" (
|
||||
builtins.toJSON {
|
||||
@@ -188,7 +189,8 @@ let
|
||||
kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)
|
||||
) rebuildsByKernel
|
||||
// {
|
||||
"10.rebuild-nixos-tests" = lib.elem "nixosTests.simple-vm" (extractPackageNames diffAttrs.rebuilds);
|
||||
"10.rebuild-nixos-tests" =
|
||||
lib.elem "nixosTests.simple-container" rebuildNames || lib.elem "nixosTests.simple-vm" rebuildNames;
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@@ -108,6 +108,8 @@ in
|
||||
tweak (
|
||||
(removeAttrs nixpkgsJobs blacklist)
|
||||
// {
|
||||
nixosTests = lib.filterAttrs (name: _: name == "simple-vm") nixosJobs.tests;
|
||||
nixosTests = lib.filterAttrs (
|
||||
name: _: name == "simple-container" || name == "simple-vm"
|
||||
) nixosJobs.tests;
|
||||
}
|
||||
)
|
||||
|
||||
@@ -99,6 +99,7 @@ async function checkTargetBranch({ github, context, core, dry }) {
|
||||
...Object.values(changed.rebuildCountByKernel),
|
||||
)
|
||||
const rebuildsAllTests =
|
||||
changed.attrdiff.changed.includes('nixosTests.simple-container') ||
|
||||
changed.attrdiff.changed.includes('nixosTests.simple-vm')
|
||||
|
||||
// https://github.com/NixOS/nixpkgs/pull/481205#issuecomment-3790123921
|
||||
|
||||
Reference in New Issue
Block a user