public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17645 from grahamc/gocd-improve

Browse Source 
gocd-agent: 16.7.0 startup fixes + test improvements
This commit is contained in:
Graham Christensen 2016-08-10 16:07:49 -04:00 committed by GitHub
commit f191b65820
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/continuous-integration/gocd-agent/default.nix
View File

@ -57,18 +57,10 @@ in {
}; };
goServer = mkOption { goServer = mkOption {
default = "127.0.0.1"; default = "https://127.0.0.1:8154/go";
type = types.str; type = types.str;
description = '' description = ''
Address of GoCD Server to attach the Go.CD Agent to. URL of the GoCD Server to attach the Go.CD Agent to.
'';
};
goServerPort = mkOption {
default = 8153;
type = types.int;
description = ''
Port that Go.CD Server is Listening on.
''; '';
}; };
@ -199,13 +191,14 @@ in {
${pkgs.jre}/bin/java ${concatStringsSep " " cfg.startupOptions} \ ${pkgs.jre}/bin/java ${concatStringsSep " " cfg.startupOptions} \
${concatStringsSep " " cfg.extraOptions} \ ${concatStringsSep " " cfg.extraOptions} \
-jar ${pkgs.gocd-agent}/go-agent/agent-bootstrapper.jar \ -jar ${pkgs.gocd-agent}/go-agent/agent-bootstrapper.jar \
${cfg.goServer} \ -serverUrl ${cfg.goServer}
${toString cfg.goServerPort}
''; '';
serviceConfig = { serviceConfig = {
User = cfg.user; User = cfg.user;
WorkingDirectory = cfg.workDir; WorkingDirectory = cfg.workDir;
RestartSec = 30;
Restart = "on-failure";
}; };
}; };
}; };

30
nixos/tests/gocd-agent.nix
View File

@ -6,7 +6,7 @@
let let
serverUrl = "localhost:8153/go/api/agents"; serverUrl = "localhost:8153/go/api/agents";
header = "Accept: application/vnd./go.cd/v2+json"; header = "Accept: application/vnd.go.cd.v2+json";
in in
import ./make-test.nix ({ pkgs, ...} : { import ./make-test.nix ({ pkgs, ...} : {
@ -15,26 +15,26 @@ import ./make-test.nix ({ pkgs, ...} : {
maintainers = [ grahamc swarren83 ]; maintainers = [ grahamc swarren83 ];
}; };
nodes = { nodes = {
gocd_agent = gocd_agent =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
virtualisation.memorySize = 2048; virtualisation.memorySize = 2048;
services.gocd-agent = { services.gocd-agent = {
enable = true; enable = true;
};
services.gocd-server = {
enable = true;
};
}; };
services.gocd-server = { };
enable = true;
};
};
};
testScript = '' testScript = ''
startAll; startAll;
$gocd_agent->waitForUnit("gocd-server"); $gocd_agent->waitForUnit("gocd-server");
$gocd_agent->waitForOpenPort("8153"); $gocd_agent->waitForOpenPort("8153");
$gocd_agent->waitForUnit("gocd-agent"); $gocd_agent->waitForUnit("gocd-agent");
$gocd_agent->waitUntilSucceeds("curl -s -f ${serverUrl} -H '${header}' | awk -F \" '/\"uuid\":\s\"[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}/ {print $4}'"); $gocd_agent->waitUntilSucceeds("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid");
$gocd_agent->waitUntilSucceeds("curl -s -f ${serverUrl} -H '${header}' | awk -F \" '/\"agent_state\":\s\"Idle\"/'"); $gocd_agent->succeed("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle");
''; '';
}) })