fix tests
This commit is contained in:
parent
25f210a21a
commit
7c96e552a3
|
@ -19,28 +19,25 @@ in
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
dummy
|
dummy
|
||||||
{
|
({ pkgs, ... }: {
|
||||||
services.buildbot-nix.master = {
|
services.buildbot-nix.master = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = "buildbot2.thalheim.io";
|
domain = "buildbot2.thalheim.io";
|
||||||
workersFile = "/var/lib/secrets/buildbot-nix/workers.json";
|
workersFile = pkgs.writeText "workers.json" ''
|
||||||
|
[
|
||||||
|
{ "name": "eve", "pass": "XXXXXXXXXXXXXXXXXXXX", "cores": 16 }
|
||||||
|
]
|
||||||
|
'';
|
||||||
github = {
|
github = {
|
||||||
tokenFile = "/var/lib/secrets/buildbot-nix/github-token";
|
tokenFile = pkgs.writeText "github-token" "ghp_000000000000000000000000000000000000";
|
||||||
webhookSecretFile = "/var/lib/secrets/buildbot-nix/github-webhook-secret";
|
webhookSecretFile = pkgs.writeText "webhookSecret" "00000000000000000000";
|
||||||
oauthSecretFile = "/var/lib/secrets/buildbot-nix/github-oauth-secret";
|
oauthSecretFile = pkgs.writeText "oauthSecret" "ffffffffffffffffffffffffffffffffffffffff";
|
||||||
oauthId = "aaaaaaaaaaaaaaaaaaaa";
|
oauthId = "aaaaaaaaaaaaaaaaaaaa";
|
||||||
user = "mic92-buildbot";
|
user = "mic92-buildbot";
|
||||||
admins = [ "Mic92" ];
|
admins = [ "Mic92" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.nginx.virtualHosts."buildbot2.thalheim.io" = {
|
})
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
};
|
|
||||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
|
||||||
security.acme.acceptTerms = true;
|
|
||||||
security.acme.defaults.email = "joerg.acme@thalheim.io";
|
|
||||||
}
|
|
||||||
buildbot-nix.nixosModules.buildbot-master
|
buildbot-nix.nixosModules.buildbot-master
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -48,12 +45,12 @@ in
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
dummy
|
dummy
|
||||||
{
|
({ pkgs, ... }: {
|
||||||
services.buildbot-nix.worker = {
|
services.buildbot-nix.worker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
workerPasswordFile = "/var/lib/secrets/buildbot-nix/worker-password";
|
workerPasswordFile = pkgs.writeText "worker-password-file" "";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
buildbot-nix.nixosModules.buildbot-worker
|
buildbot-nix.nixosModules.buildbot-worker
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,18 +2,22 @@
|
||||||
name = "from-nixos";
|
name = "from-nixos";
|
||||||
nodes = {
|
nodes = {
|
||||||
# `self` here is set by using specialArgs in `lib.nix`
|
# `self` here is set by using specialArgs in `lib.nix`
|
||||||
node1 = { self, ... }: {
|
node1 = { self, pkgs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
self.nixosModules.buildbot-master
|
self.nixosModules.buildbot-master
|
||||||
];
|
];
|
||||||
services.buildbot-nix.master = {
|
services.buildbot-nix.master = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = "buildbot2.thalheim.io";
|
domain = "buildbot2.thalheim.io";
|
||||||
workersFile = "/var/lib/secrets/buildbot-nix/workers.json";
|
workersFile = pkgs.writeText "workers.json" ''
|
||||||
|
[
|
||||||
|
{ "name": "eve", "pass": "XXXXXXXXXXXXXXXXXXXX", "cores": 16 }
|
||||||
|
]
|
||||||
|
'';
|
||||||
github = {
|
github = {
|
||||||
tokenFile = "/var/lib/secrets/buildbot-nix/github-token";
|
tokenFile = pkgs.writeText "github-token" "ghp_000000000000000000000000000000000000";
|
||||||
webhookSecretFile = "/var/lib/secrets/buildbot-nix/github-webhook-secret";
|
webhookSecretFile = pkgs.writeText "webhookSecret" "00000000000000000000";
|
||||||
oauthSecretFile = "/var/lib/secrets/buildbot-nix/github-oauth-secret";
|
oauthSecretFile = pkgs.writeText "oauthSecret" "ffffffffffffffffffffffffffffffffffffffff";
|
||||||
oauthId = "aaaaaaaaaaaaaaaaaaaa";
|
oauthId = "aaaaaaaaaaaaaaaaaaaa";
|
||||||
user = "mic92-buildbot";
|
user = "mic92-buildbot";
|
||||||
admins = [ "Mic92" ];
|
admins = [ "Mic92" ];
|
||||||
|
|
|
@ -130,6 +130,7 @@ in
|
||||||
ps.treq
|
ps.treq
|
||||||
ps.psycopg2
|
ps.psycopg2
|
||||||
(ps.toPythonModule pkgs.buildbot-worker)
|
(ps.toPythonModule pkgs.buildbot-worker)
|
||||||
|
ps.setuptools
|
||||||
pkgs.buildbot-plugins.www
|
pkgs.buildbot-plugins.www
|
||||||
pkgs.buildbot-plugins.www-react
|
pkgs.buildbot-plugins.www-react
|
||||||
pkgs.buildbot-plugins.console-view
|
pkgs.buildbot-plugins.console-view
|
||||||
|
|
|
@ -25,7 +25,7 @@ in
|
||||||
description = "The buildbot master url.";
|
description = "The buildbot master url.";
|
||||||
};
|
};
|
||||||
workerPasswordFile = lib.mkOption {
|
workerPasswordFile = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.path;
|
||||||
description = "The buildbot worker password file.";
|
description = "The buildbot worker password file.";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue