From c1e5f440c696e05f2dd11b763488584466e4910a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Oct 2018 21:02:42 -0400 Subject: remove android autobuilder container --- joeyconfig.hs | 2 -- .../Property/SiteSpecific/GitAnnexBuilder.hs | 36 ---------------------- 2 files changed, 38 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index db653fc9..911df553 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -154,8 +154,6 @@ orca = host "orca.kitenet.net" $ props & Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer GitAnnexBuilder.stackAutoBuilder (Stable "jessie") X86_32 (Just "ancient") (Cron.Times "45 * * * *") "2h") - ! Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer - (Cron.Times "1 1 * * *") "3h") banana :: Host banana = host "banana.kitenet.net" $ props diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 7984a2aa..6a6bcd31 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -186,39 +186,3 @@ armAutoBuilder baseautobuilder suite arch flavor = `File.containsLine` "jobs: 1" -- Work around https://github.com/systemd/systemd/issues/7135 & Systemd.containerCfg "--system-call-filter=set_tls" - -androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container -androidAutoBuilderContainer crontimes timeout = - androidAutoBuilderContainer' "android-git-annex-builder" - (tree "android" Nothing) builddir crontimes timeout - --- Android is cross-built in a Debian i386 container, using the Android NDK. -androidAutoBuilderContainer' - :: Systemd.MachineName - -> Property DebianLike - -> FilePath - -> Times - -> TimeOut - -> Systemd.Container -androidAutoBuilderContainer' name setupgitannexdir gitannexdir crontimes timeout = - Systemd.container name $ \d -> bootstrap d $ props - & osDebian (Stable "jessie") X86_32 - & Apt.stdSourcesList - & User.accountFor (User builduser) - & File.dirExists gitbuilderdir - & File.ownerGroup homedir (User builduser) (Group builduser) - & flagFile chrootsetup ("/chrootsetup") - `requires` setupgitannexdir - & haskellPkgsInstalled "android" - & Apt.unattendedUpgrades - & buildDepsNoHaskellLibs - & autobuilder "android" crontimes timeout - where - -- Use git-annex's android chroot setup script, which will install - -- ghc-android and the NDK, all build deps, etc, in the home - -- directory of the builder user. - chrootsetup = scriptProperty - [ "cd " ++ gitannexdir ++ " && ./standalone/android/buildchroot-inchroot" - ] - `assume` MadeChange - bootstrap = Chroot.debootstrapped mempty -- cgit v1.2.3