Unverified Commit 7e0bcb51 authored by Niklas Korz's avatar Niklas Korz Committed by GitHub
Browse files

nixosTests.jenkins: fix running on darwin hosts (#445282)

parents 0c17937d 444d9c47

nixos/tests/jenkins.nix

+4 −3
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
#   3. jenkins service not started on slave node

#   4. declarative jobs can be added and removed



{ pkgs, ... }:

{ config, lib, ... }:

{

  name = "jenkins";

  meta = with pkgs.lib.maintainers; {

  meta = with lib.maintainers; {

    maintainers = [

      bjornfor

    ];
@@ -60,7 +60,7 @@ 
        };



        specialisation.noJenkinsJobs.configuration = {

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

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

        };



        # should have no effect
@@ -89,6 +89,7 @@ 
  testScript =

    { nodes, ... }:

    let

      pkgs = config.node.pkgs;

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

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

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