summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-20 18:28:13 -0400
committerJoey Hess2014-05-20 18:28:13 -0400
commit9acd70eb4c2eb680eed5affda4be8eb59b7507f6 (patch)
tree6c2c67974bae168fbb557b7ad21aa8ee472c5997 /config-joey.hs
parent7eeb58dab91eeb73d9491a89313bb28aa00ee833 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs9
1 files changed, 5 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 782c579b..7f32d8b6 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -94,8 +94,8 @@ hosts = -- (o) `
& Docker.configured
& Docker.docked hosts "amd64-git-annex-builder"
& Docker.docked hosts "i386-git-annex-builder"
- & Docker.docked hosts "armel-git-annex-builder-companion"
- & Docker.docked hosts "armel-git-annex-builder"
+ ! Docker.docked hosts "armel-git-annex-builder-companion"
+ ! Docker.docked hosts "armel-git-annex-builder"
& Docker.garbageCollected `period` Daily
& Apt.buildDep ["git-annex"] `period` Daily
@@ -201,7 +201,8 @@ hosts = -- (o) `
& Docker.volume GitAnnexBuilder.homedir
& File.ownerGroup GitAnnexBuilder.homedir GitAnnexBuilder.builduser GitAnnexBuilder.builduser
-- Install current versions of build deps from cabal.
- & GitAnnexBuilder.treeDeps "armel"
+ & GitAnnexBuilder.tree "armel"
+ & GitAnnexBuilder.buildDepsNoHaskellLibs
& GitAnnexBuilder.cabalDeps
-- The armel builder can ssh to this companion,
-- using $COMPANION_PORT_22_TCP_ADDR as the hostname,
@@ -219,7 +220,7 @@ hosts = -- (o) `
-- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages
-- which is not fully automated.)
- & GitAnnexBuilder.builder "armel" "1 3 * * *" "5h" True
+ & GitAnnexBuilder.builder' GitAnnexBuilder.buildDepsNoHaskellLibs "armel" "1 3 * * *" "5h" True
] ++ monsters
standardGitAnnexBuilder :: Architecture -> Int -> GitAnnexBuilder.TimeOut -> Host