diff options
| author | lassulus <lass@lassul.us> | 2017-01-26 23:44:31 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-01-26 23:44:31 +0100 |
| commit | fc627d0b999edb8bb7c58f2efa7dcbe1ccb83e7d (patch) | |
| tree | 27df91c7e9a267766b0727d4aff22ca4db491746 | |
| parent | 712b05eb47ef796500a057cd6c2bec50152db970 (diff) | |
l 1 prism: remove obsolete nin stuff
| -rw-r--r-- | lass/1systems/prism.nix | 13 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 17 |
2 files changed, 18 insertions, 12 deletions
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index d8980a10c..86c2c7416 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -227,6 +227,7 @@ in { }; } { + # Nin stuff users.users.nin = { uid = genid "nin"; inherit (config.krebs.users.nin) home; @@ -240,18 +241,6 @@ in { "libvirtd" ]; }; - krebs.git.rules = [ - { - user = [ config.krebs.users.nin ]; - repo = [ config.krebs.git.repos.stockholm ]; - perm = with git; push "refs/heads/nin" [ fast-forward non-fast-forward create delete merge ]; - } - ]; - krebs.repo-sync.repos.stockholm.nin = { - origin.url = "http://cgit.prism/stockholm"; - origin.ref = "heads/nin"; - mirror.url = "git@${config.networking.hostName}:stockholm"; - }; krebs.iptables.tables.nat.PREROUTING.rules = [ { v6 = false; precedence = 1000; predicate = "-d 213.239.205.240 -p tcp --dport 1337"; target = "DNAT --to-destination 192.168.122.24:22"; } ]; diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 7057d0c3d..c9e2928b3 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -58,6 +58,11 @@ in { "NIX_REMOTE": "daemon", "dummy_secrets": "true", } + env_nin = { + "LOGNAME": "nin", + "NIX_REMOTE": "daemon", + "dummy_secrets": "true", + } env_shared = { "LOGNAME": "shared", "NIX_REMOTE": "daemon", @@ -126,6 +131,18 @@ in { ] ) + for i in [ "hiawatha", "onondaga" ]: + addShell(f,name="build-{}".format(i),env=env_nin, + command=nixshell + \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ + test \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ + method=build \ + system={}".format(i) + ] + ) + bu.append( util.BuilderConfig( name="build-hosts", |