commit 444d9c47028b98f2b89b6ff997f02ce43b9fa518 · pyrox.dev/nixpkgs

+4 -3
nixos/tests/jenkins.nix
···

       4
       4
        
       #   3. jenkins service not started on slave node

     

       5
       5
        
       #   4. declarative jobs can be added and removed

     

       6
       6
        
       

     

       7
       7
       -
       { pkgs, ... }:

     

       7
       7
       +
       { config, lib, ... }:

     

       8
       8
        
       {

     

       9
       9
        
         name = "jenkins";

     

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

     

       10
       10
       +
         meta = with lib.maintainers; {

     

       11
       11
        
           maintainers = [

     

       12
       12
        
             bjornfor

     

       13
       13
        
           ];

     
···

       60
       60
        
               };

     

       61
       61
        
       

     

       62
       62
        
               specialisation.noJenkinsJobs.configuration = {

     

       63
       63
       -
                 services.jenkins.jobBuilder.nixJobs = pkgs.lib.mkForce [ ];

     

       63
       63
       +
                 services.jenkins.jobBuilder.nixJobs = lib.mkForce [ ];

     

       64
       64
        
               };

     

       65
       65
        
       

     

       66
       66
        
               # should have no effect

     
···

       89
       89
        
         testScript =

     

       90
       90
        
           { nodes, ... }:

     

       91
       91
        
           let

     

       92
       92
       +
             pkgs = config.node.pkgs;

     

       92
       93
        
             configWithoutJobs = "${nodes.master.system.build.toplevel}/specialisation/noJenkinsJobs";

     

       93
       94
        
             jenkinsPort = nodes.master.services.jenkins.port;

     

       94
       95
        
             jenkinsUrl = "http://localhost:${toString jenkinsPort}";