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

Changed files
+4 -3
nixos
tests
+4 -3
nixos/tests/jenkins.nix
···
# 3. jenkins service not started on slave node
# 4. declarative jobs can be added and removed
-
{ pkgs, ... }:
{
name = "jenkins";
-
meta = with pkgs.lib.maintainers; {
maintainers = [
bjornfor
];
···
};
specialisation.noJenkinsJobs.configuration = {
-
services.jenkins.jobBuilder.nixJobs = pkgs.lib.mkForce [ ];
};
# should have no effect
···
testScript =
{ nodes, ... }:
let
configWithoutJobs = "${nodes.master.system.build.toplevel}/specialisation/noJenkinsJobs";
jenkinsPort = nodes.master.services.jenkins.port;
jenkinsUrl = "http://localhost:${toString jenkinsPort}";
···
# 3. jenkins service not started on slave node
# 4. declarative jobs can be added and removed
+
{ config, lib, ... }:
{
name = "jenkins";
+
meta = with lib.maintainers; {
maintainers = [
bjornfor
];
···
};
specialisation.noJenkinsJobs.configuration = {
+
services.jenkins.jobBuilder.nixJobs = lib.mkForce [ ];
};
# should have no effect
···
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}";