propellor spin

This commit is contained in:
Joey Hess 2014-05-19 19:32:16 -04:00
parent c8b59684cd
commit e2c67a6e18
Failed to extract signature
1 changed files with 13 additions and 8 deletions

View File

@ -192,28 +192,33 @@ hosts = -- (o) `
, standardGitAnnexBuilder "amd64" 15 "2h" , standardGitAnnexBuilder "amd64" 15 "2h"
, standardGitAnnexBuilder "i386" 45 "2h" , standardGitAnnexBuilder "i386" 45 "2h"
-- armel builder has a companion container using amd64 that -- armel builder has a companion container using amd64 that
-- runs the build first to get TH splices. They share a home -- runs the build first to get TH splices. They need
-- directory, and need to have the same versions of all haskell -- to have the same versions of all haskell libraries installed.
-- libraries installed. The armel builder can ssh in to the
-- companion.
, Docker.container "armel-git-annex-builder-companion" , Docker.container "armel-git-annex-builder-companion"
(image $ System (Debian Unstable) "amd64") (image $ System (Debian Unstable) "amd64")
& Docker.volume GitAnnexBuilder.homedir
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
-- This volume is shared with the armel builder.
& Docker.volume GitAnnexBuilder.homedir
& File.ownerGroup GitAnnexBuilder.homedir GitAnnexBuilder.builduser GitAnnexBuilder.builduser
-- Install current versions of build deps from cabal.
& GitAnnexBuilder.treeDeps "armel" & GitAnnexBuilder.treeDeps "armel"
& GitAnnexBuilder.cabalDeps & GitAnnexBuilder.cabalDeps
& GitAnnexBuilder.sshKeyGen -- The armel builder can ssh to this companion,
-- using $COMPANION_PORT_22_TCP_ADDR as the hostname,
& Docker.expose "22" & Docker.expose "22"
& Apt.serviceInstalledRunning "ssh" & Apt.serviceInstalledRunning "ssh"
-- ssh key is shared via the home directory volume
& GitAnnexBuilder.sshKeyGen
, Docker.container "armel-git-annex-builder" , Docker.container "armel-git-annex-builder"
(image $ System (Debian Unstable) "armel") (image $ System (Debian Unstable) "armel")
& Apt.unattendedUpgrades
& Apt.installed ["openssh-client"]
& Docker.link "armel-git-annex-builder-companion" "companion" & Docker.link "armel-git-annex-builder-companion" "companion"
& Docker.volumes_from "armel-git-annex-builder-companion" & Docker.volumes_from "armel-git-annex-builder-companion"
& GitAnnexBuilder.builder "armel" "1 3 * * *" "5h" True
-- TODO: automate installing haskell libs -- TODO: automate installing haskell libs
-- (Currently have to run -- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages) -- git-annex/standalone/linux/install-haskell-packages)
& Apt.unattendedUpgrades & GitAnnexBuilder.builder "armel" "1 3 * * *" "5h" True
] ++ monsters ] ++ monsters
standardGitAnnexBuilder :: Architecture -> Int -> GitAnnexBuilder.TimeOut -> Host standardGitAnnexBuilder :: Architecture -> Int -> GitAnnexBuilder.TimeOut -> Host