commit b16f158e1b15509ef7ad19032f1b80646f514151 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       611
       611
        
         hostname = handleTest ./hostname.nix { };

     

       612
       612
        
         hound = handleTest ./hound.nix { };

     

       613
       613
        
         hub = handleTest ./git/hub.nix { };

     

       614
       614
       -
         hydra = handleTest ./hydra { };

     

       614
       614
       +
         hydra = runTest ./hydra;

     

       615
       615
        
         i3wm = handleTest ./i3wm.nix { };

     

       616
       616
        
         icingaweb2 = runTest ./icingaweb2.nix;

     

       617
       617
        
         ifm = handleTest ./ifm.nix { };

+1 -2

nixos/tests/hydra/common.nix

···

       1
       1
       -
       { system, ... }:

     

       2
       1
        
       {

     

       3
       2
        
         baseConfig =

     

       4
       3
        
           { pkgs, ... }:

     
···

       6
       5
        
             trivialJob = pkgs.writeTextDir "trivial.nix" ''

     

       7
       6
        
               { trivial = builtins.derivation {

     

       8
       7
        
                   name = "trivial";

     

       9
       9
       -
                   system = "${system}";

     

       8
       8
       +
                   system = "${pkgs.stdenv.hostPlatform.system}";

     

       10
       9
        
                   builder = "/bin/sh";

     

       11
       10
        
                   allowSubstitutes = false;

     

       12
       11
        
                   preferLocalBuild = true;

+35 -56

nixos/tests/hydra/default.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (import ./common.nix) baseConfig;

     

       4
       4
       +
       in

     

       1
       5
        
       {

     

       2
       2
       -
         system ? builtins.currentSystem,

     

       3
       3
       -
         config ? { },

     

       4
       4
       -
         pkgs ? import ../../.. { inherit system config; },

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       with import ../../lib/testing-python.nix { inherit system pkgs; };

     

       8
       8
       -
       with pkgs.lib;

     

       9
       9
       -
       

     

       10
       10
       -
       let

     

       11
       11
       -
       

     

       12
       12
       -
         inherit (import ./common.nix { inherit system; }) baseConfig;

     

       13
       13
       -
       

     

       14
       14
       -
         hydraPkgs = {

     

       15
       15
       -
           inherit (pkgs) hydra;

     

       6
       6
       +
         name = "hydra";

     

       7
       7
       +
         meta = with pkgs.lib.maintainers; {

     

       8
       8
       +
           maintainers = [ lewo ];

     

       16
       9
        
         };

     

       17
       10
        
       

     

       18
       18
       -
         makeHydraTest =

     

       19
       19
       -
           with pkgs.lib;

     

       20
       20
       -
           name: package:

     

       21
       21
       -
           makeTest {

     

       22
       22
       -
             name = "hydra-${name}";

     

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

     

       24
       24
       -
               maintainers = [ lewo ];

     

       25
       25
       -
             };

     

       11
       11
       +
         nodes.machine =

     

       12
       12
       +
           { pkgs, lib, ... }:

     

       13
       13
       +
           {

     

       14
       14
       +
             imports = [ baseConfig ];

     

       15
       15
       +
           };

     

       26
       16
        
       

     

       27
       27
       -
             nodes.machine =

     

       28
       28
       -
               { pkgs, lib, ... }:

     

       29
       29
       -
               {

     

       30
       30
       -
                 imports = [ baseConfig ];

     

       31
       31
       -
                 services.hydra = { inherit package; };

     

       32
       32
       -
               };

     

       17
       17
       +
         testScript = ''

     

       18
       18
       +
           # let the system boot up

     

       19
       19
       +
           machine.wait_for_unit("multi-user.target")

     

       20
       20
       +
           # test whether the database is running

     

       21
       21
       +
           machine.wait_for_unit("postgresql.service")

     

       22
       22
       +
           # test whether the actual hydra daemons are running

     

       23
       23
       +
           machine.wait_for_unit("hydra-init.service")

     

       24
       24
       +
           machine.require_unit_state("hydra-queue-runner.service")

     

       25
       25
       +
           machine.require_unit_state("hydra-evaluator.service")

     

       26
       26
       +
           machine.require_unit_state("hydra-notify.service")

     

       33
       27
        
       

     

       34
       34
       -
             testScript = ''

     

       35
       35
       -
               # let the system boot up

     

       36
       36
       -
               machine.wait_for_unit("multi-user.target")

     

       37
       37
       -
               # test whether the database is running

     

       38
       38
       -
               machine.wait_for_unit("postgresql.service")

     

       39
       39
       -
               # test whether the actual hydra daemons are running

     

       40
       40
       -
               machine.wait_for_unit("hydra-init.service")

     

       41
       41
       -
               machine.require_unit_state("hydra-queue-runner.service")

     

       42
       42
       -
               machine.require_unit_state("hydra-evaluator.service")

     

       43
       43
       -
               machine.require_unit_state("hydra-notify.service")

     

       28
       28
       +
           machine.succeed("hydra-create-user admin --role admin --password admin")

     

       44
       29
        
       

     

       45
       45
       -
               machine.succeed("hydra-create-user admin --role admin --password admin")

     

       30
       30
       +
           # create a project with a trivial job

     

       31
       31
       +
           machine.wait_for_open_port(3000)

     

       46
       32
        
       

     

       47
       47
       -
               # create a project with a trivial job

     

       48
       48
       -
               machine.wait_for_open_port(3000)

     

       33
       33
       +
           # make sure the build as been successfully built

     

       34
       34
       +
           machine.succeed("create-trivial-project.sh")

     

       49
       35
        
       

     

       50
       50
       -
               # make sure the build as been successfully built

     

       51
       51
       -
               machine.succeed("create-trivial-project.sh")

     

       52
       52
       -
       

     

       53
       53
       -
               machine.wait_until_succeeds(

     

       54
       54
       -
                   'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq'

     

       55
       55
       -
               )

     

       56
       56
       -
       

     

       57
       57
       -
               machine.wait_until_succeeds(

     

       58
       58
       -
                   'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'

     

       59
       59
       -
               )

     

       60
       60
       -
             '';

     

       61
       61
       -
           };

     

       36
       36
       +
           machine.wait_until_succeeds(

     

       37
       37
       +
               'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq'

     

       38
       38
       +
           )

     

       62
       39
        
       

     

       63
       63
       -
       in

     

       64
       64
       -
       

     

       65
       65
       -
       mapAttrs makeHydraTest hydraPkgs

     

       40
       40
       +
           machine.wait_until_succeeds(

     

       41
       41
       +
               'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'

     

       42
       42
       +
           )

     

       43
       43
       +
         '';

     

       44
       44
       +
       }

+1 -1

pkgs/by-name/hy/hydra/package.nix

···

       265
       265
        
       

     

       266
       266
        
         passthru = {

     

       267
       267
        
           inherit nix perlDeps;

     

       268
       268
       -
           tests.basic = nixosTests.hydra.hydra;

     

       268
       268
       +
           tests = { inherit (nixosTests) hydra; };

     

       269
       269
        
           updateScript = unstableGitUpdater { };

     

       270
       270
        
         };

     

       271
       271