commit e5ce5c25005d15d01f69166e3a10fd3501e1ec2b · pyrox.dev/nixpkgs

+8 -2

ci/eval/compare/default.nix

···

       110
       110
        
                 // lib.mapAttrs' (

     

       111
       111
        
                   kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)

     

       112
       112
        
                 ) rebuildsByKernel

     

       113
       113
       -
                 # Set the "11.by: package-maintainer" label to whether all packages directly

     

       114
       114
       -
                 # changed are maintained by the PR's author.

     

       115
       113
        
                 // {

     

       114
       114
       +
                   "10.rebuild-nixos-tests" =

     

       115
       115
       +
                     lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds)

     

       116
       116
       +
                     &&

     

       117
       117
       +
                       # Only set this label when no other label with indication for staging has been set.

     

       118
       118
       +
                       # This avoids confusion whether to target staging or batch this with kernel updates.

     

       119
       119
       +
                       lib.last (lib.sort lib.lessThan (lib.attrValues rebuildCountByKernel)) <= 500;

     

       120
       120
       +
                   # Set the "11.by: package-maintainer" label to whether all packages directly

     

       121
       121
       +
                   # changed are maintained by the PR's author.

     

       116
       122
        
                   "11.by: package-maintainer" =

     

       117
       123
        
                     maintainers ? ${githubAuthorId}

     

       118
       124
        
                     && lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (

+15 -3

ci/eval/outpaths.nix

···

       14
       14
        
       }:

     

       15
       15
        
       let

     

       16
       16
        
         lib = import (path + "/lib");

     

       17
       17
       -
         hydraJobs =

     

       17
       17
       +
       

     

       18
       18
       +
         nixpkgsJobs =

     

       18
       19
        
           import (path + "/pkgs/top-level/release.nix")

     

       19
       20
        
             # Compromise: accuracy vs. resources needed for evaluation.

     

       20
       21
        
             {

     
···

       59
       60
        
                 __allowFileset = false;

     

       60
       61
        
               };

     

       61
       62
        
             };

     

       63
       63
       +
       

     

       64
       64
       +
         nixosJobs = import (path + "/nixos/release.nix") {

     

       65
       65
       +
           inherit attrNamesOnly;

     

       66
       66
       +
           supportedSystems = if systems == null then [ builtins.currentSystem ] else systems;

     

       67
       67
       +
         };

     

       68
       68
       +
       

     

       62
       69
        
         recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };

     

       63
       70
        
       

     

       64
       64
       -
         # hydraJobs leaves recurseForDerivations as empty attrmaps;

     

       71
       71
       +
         # release-lib leaves recurseForDerivations as empty attrmaps;

     

       65
       72
        
         # that would break nix-env and we also need to recurse everywhere.

     

       66
       73
        
         tweak = lib.mapAttrs (

     

       67
       74
        
           name: val:

     
···

       87
       94
        
         ];

     

       88
       95
        
       

     

       89
       96
        
       in

     

       90
       90
       -
       tweak (builtins.removeAttrs hydraJobs blacklist)

     

       97
       97
       +
       tweak (

     

       98
       98
       +
         (builtins.removeAttrs nixpkgsJobs blacklist)

     

       99
       99
       +
         // {

     

       100
       100
       +
           nixosTests.simple = nixosJobs.tests.simple;

     

       101
       101
       +
         }

     

       102
       102
       +
       )

+29 -7

nixos/release.nix

···

       12
       12
        
           "aarch64-linux"

     

       13
       13
        
         ],

     

       14
       14
        
         configuration ? { },

     

       15
       15
       +
       

     

       16
       16
       +
         # This flag, if set to true, causes the resulting tree of attributes

     

       17
       17
       +
         # to *not* have a ".${system}" suffixed upon every job name like Hydra

     

       18
       18
       +
         # expects. So far, this is only implemented for `tests`.

     

       19
       19
       +
         #

     

       20
       20
       +
         # This flag exists mainly for use by ci/eval/attrpaths.nix; see

     

       21
       21
       +
         # that file for full details.  The exact behavior of this flag

     

       22
       22
       +
         # may change; it should be considered an internal implementation

     

       23
       23
       +
         # detail of ci/eval.

     

       24
       24
       +
         attrNamesOnly ? false,

     

       15
       25
        
       }:

     

       16
       26
        
       

     

       17
       27
        
       with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; };

     
···

       31
       41
        
           import ./tests/all-tests.nix {

     

       32
       42
        
             inherit system;

     

       33
       43
        
             pkgs = import ./.. { inherit system; };

     

       34
       34
       -
             callTest = config: {

     

       35
       35
       -
               ${system} = hydraJob config.test;

     

       36
       36
       -
             };

     

       44
       44
       +
             callTest =

     

       45
       45
       +
               config:

     

       46
       46
       +
               if attrNamesOnly then

     

       47
       47
       +
                 hydraJob config.test

     

       48
       48
       +
               else

     

       49
       49
       +
                 {

     

       50
       50
       +
                   ${system} = hydraJob config.test;

     

       51
       51
       +
                 };

     

       37
       52
        
           }

     

       38
       53
        
           // {

     

       39
       54
        
             # for typechecking of the scripts and evaluation of

     
···

       41
       56
        
             allDrivers = import ./tests/all-tests.nix {

     

       42
       57
        
               inherit system;

     

       43
       58
        
               pkgs = import ./.. { inherit system; };

     

       44
       44
       -
               callTest = config: {

     

       45
       45
       -
                 ${system} = hydraJob config.driver;

     

       46
       46
       -
               };

     

       59
       59
       +
               callTest =

     

       60
       60
       +
                 config:

     

       61
       61
       +
                 if attrNamesOnly then

     

       62
       62
       +
                   hydraJob config.test

     

       63
       63
       +
                 else

     

       64
       64
       +
                   {

     

       65
       65
       +
                     ${system} = hydraJob config.driver;

     

       66
       66
       +
                   };

     

       47
       67
        
             };

     

       48
       68
        
           };

     

       49
       69
        
       

     

       50
       50
       -
         allTests = foldAttrs recursiveUpdate { } (map allTestsForSystem supportedSystems);

     

       70
       70
       +
         allTests = foldAttrs recursiveUpdate { } (

     

       71
       71
       +
           map allTestsForSystem (if attrNamesOnly then [ (head supportedSystems) ] else supportedSystems)

     

       72
       72
       +
         );

     

       51
       73
        
       

     

       52
       74
        
         pkgs = import ./.. { system = "x86_64-linux"; };

     

       53
       75

+1 -9

nixos/tests/simple.nix

···

       1
       1
       -
       { pkgs, ... }:

     

       2
       1
        
       {

     

       3
       2
        
         name = "simple";

     

       4
       4
       -
         meta = with pkgs.lib.maintainers; {

     

       5
       5
       -
           maintainers = [ ];

     

       6
       6
       -
         };

     

       7
       3
        
       

     

       8
       8
       -
         nodes.machine =

     

       9
       9
       -
           { ... }:

     

       10
       10
       -
           {

     

       11
       11
       -
             imports = [ ../modules/profiles/minimal.nix ];

     

       12
       12
       -
           };

     

       4
       4
       +
         nodes.machine = { };

     

       13
       5
        
       

     

       14
       6
        
         testScript = ''

     

       15
       7
        
           start_all()