cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-05-29 19:18:35 -04:00
parent a9086c0eea
commit 78fecfcba4
Failed to extract signature
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config-joey.hs
View File

@ -129,17 +129,33 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64"
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Postfix.satellite & Postfix.satellite
& Apt.serviceInstalledRunning "ntp"
& Systemd.persistentJournal & Systemd.persistentJournal
& Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer "amd64" 15 "2h")
& Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer "i386" 15 "2h") & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
& Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer (Cron.Times "1 1 * * *") "3h") (System (Debian Testing) "amd64") fifteenpast "2h")
& Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
(System (Debian Testing) "i386") fifteenpast "2h")
& Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer
(Cron.Times "1 1 * * *") "3h")
where
fifteenpast = Cron.Times "15 * * * *"
honeybee :: Host honeybee :: Host
honeybee = standardSystem "honeybee.kitenet.net" Unstable "armhf" honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf"
[ "Arm git-annex build box." ] [ "Arm git-annex build box." ]
& ipv6 "2001:4830:1600:187::2" & ipv6 "2001:4830:1600:187::2"
-- No unattended upgrades as there is currently no console access.
-- (Also, system is not currently running a stock kernel,
-- although it should be able to.)
& Postfix.satellite & Postfix.satellite
& Apt.serviceInstalledRunning "ntp"
& Apt.serviceInstalledRunning "aiccu"
-- Using unstable to get new enough ghc for TH on arm.
& Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainer
(System (Debian Unstable) "armel") (Cron.Daily) "22h")
-- This is not a complete description of kite, since it's a -- This is not a complete description of kite, since it's a
-- multiuser system with eg, user passwords that are not deployed -- multiuser system with eg, user passwords that are not deployed

20
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -94,19 +94,19 @@ cabalDeps = flagFile go cabalupdated
go = userScriptProperty (User builduser) ["cabal update && cabal install git-annex --only-dependencies || true"] go = userScriptProperty (User builduser) ["cabal update && cabal install git-annex --only-dependencies || true"]
cabalupdated = homedir </> ".cabal" </> "packages" </> "hackage.haskell.org" </> "00-index.cache" cabalupdated = homedir </> ".cabal" </> "packages" </> "hackage.haskell.org" </> "00-index.cache"
standardAutoBuilderContainer :: Architecture -> Int -> TimeOut -> Systemd.Container standardAutoBuilderContainer :: System -> Times -> TimeOut -> Systemd.Container
standardAutoBuilderContainer arch buildminute timeout = Systemd.container name bootstrap standardAutoBuilderContainer osver@(System _ arch) crontime timeout =
& os osver Systemd.container name bootstrap
& Apt.stdSourcesList & os osver
& Apt.unattendedUpgrades & Apt.stdSourcesList
& User.accountFor (User builduser) & Apt.unattendedUpgrades
& tree arch & User.accountFor (User builduser)
& buildDepsApt & tree arch
& autobuilder arch (Cron.Times $ show buildminute ++ " * * * *") timeout & buildDepsApt
& autobuilder arch crontime timeout
where where
name = arch ++ "-git-annex-builder" name = arch ++ "-git-annex-builder"
bootstrap = Chroot.debootstrapped osver mempty bootstrap = Chroot.debootstrapped osver mempty
osver = System (Debian Testing) arch
androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container
androidAutoBuilderContainer crontimes timeout = androidAutoBuilderContainer crontimes timeout =