X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fbuildbot%2Fprojects%2Fdenise%2F__init__.py;h=20ba913002195e38bd9fd9f285b101a82d20066e;hb=485354e5289157cea4de521b5ff13aae9f85a02d;hp=c07655beb147c1589ef62e08ec8c37dcb530bb25;hpb=cb589b2e41d966719ab7c21ea6dbf0869c3b0eed;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/buildbot/projects/denise/__init__.py b/modules/private/buildbot/projects/denise/__init__.py
index c07655b..20ba913 100644
--- a/modules/private/buildbot/projects/denise/__init__.py
+++ b/modules/private/buildbot/projects/denise/__init__.py
@@ -15,8 +15,12 @@ class E():
     SSH_HOST_KEY      = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFbhFTl2A2RJn5L51yxJM4XfCS2ZaiSX/jo9jFSdghF"
 
     OMS_RELEASE_PATH  = "/var/lib/buildbot/outputs/denise/oms"
+    OMS_BETA_PATH     = "/var/lib/buildbot/outputs/denise/oms_beta"
     OMS_GIT_URL       = "gitolite@git.immae.eu:perso/Denise/oms"
 
+    AVENTURIERS_RELEASE_PATH = "/var/lib/buildbot/outputs/denise/aventuriers"
+    AVENTURIERS_GIT_URL      = "https://git.immae.eu/perso/Denise/aventuriers.git"
+
     # master.cfg
     SECRETS_FILE       = os.getcwd() + "/secrets"
     LDAP_URL           = "ldaps://ldap.immae.eu:636"
@@ -51,22 +55,77 @@ def configure(c):
     c['workers'].append(worker.LocalWorker("generic-worker-denise"))
 
     c['schedulers'].append(hook_scheduler("DeniseOMS", timer=1))
+    c['schedulers'].append(hook_scheduler("DeniseAventuriers", timer=1))
     c['schedulers'].append(force_scheduler("force_denise", [
-        "DeniseOMS_build"
+        "DeniseOMS_build", "DeniseAventuriers_build"
         ]))
 
     c['builders'].append(denise_oms_factory())
+    c['builders'].append(denise_aventuriers_factory())
 
 def denise_oms_factory():
+    @util.renderer
+    def oms_run_path(props):
+        if props.hasProperty("branch") and len(props["branch"]) > 0 and props["branch"] == "master":
+            return "/run/denise_oms/gunicorn.pid"
+        else:
+            return "/run/denise_oms_beta/gunicorn.pid"
+
+    @util.renderer
+    def oms_url(props):
+        if props.hasProperty("branch") and len(props["branch"]) > 0 and props["branch"] == "master":
+            return "https://oms.syanni.eu"
+        else:
+            return "https://beta.oms.syanni.eu"
+
+    @util.renderer
+    def oms_path(props):
+        if props.hasProperty("branch") and len(props["branch"]) > 0 and props["branch"] == "master":
+            return E.OMS_RELEASE_PATH
+        else:
+            return E.OMS_BETA_PATH
+
     factory = util.BuildFactory()
     factory.addStep(steps.Git(logEnviron=False, repourl=E.OMS_GIT_URL,
         submodules=True, sshPrivateKey=open(E.SSH_KEY_PATH).read().rstrip(),
         sshHostKey=E.SSH_HOST_KEY, mode="full", method="copy"))
-    factory.addStep(steps.MasterShellCommand(command="rm -rf {}".format(E.OMS_RELEASE_PATH)))
+    factory.addStep(steps.MasterShellCommand(command=util.Interpolate("rm -rf %(kw:oms_path)s", oms_path=oms_path)))
     factory.addStep(steps.DirectoryUpload(workersrc="../source",
-        masterdest=E.OMS_RELEASE_PATH,
-        url="https://oms.syanni.eu"))
-    factory.addStep(steps.MasterShellCommand(command="chmod -R a+rX {}".format(E.OMS_RELEASE_PATH)))
-    factory.addStep(steps.MasterShellCommand(command="kill $(cat /run/denise_oms/gunicorn.pid)"))
+        masterdest=oms_path,
+        url=oms_url))
+    factory.addStep(steps.MasterShellCommand(command=util.Interpolate("chmod -R a+rX %(kw:oms_path)s", oms_path=oms_path)))
+    factory.addStep(steps.MasterShellCommand(command=util.Interpolate("kill $(cat %(kw:oms_run_path)s)", oms_run_path=oms_run_path)))
 
     return util.BuilderConfig(name="DeniseOMS_build", workernames=["generic-worker-denise"], factory=factory)
+
+def denise_aventuriers_factory():
+    path_env = {
+            "PATH": os.environ["BUILDBOT_PATH_Aventuriers"] + ":${PATH}",
+            "TZ": "Europe/Paris",
+            }
+
+    factory = util.BuildFactory()
+    factory.addStep(steps.Git(logEnviron=False, repourl=E.AVENTURIERS_GIT_URL,
+        submodules=True, mode="full", method="fresh"))
+    factory.addStep(steps.ShellCommand(name="build files",
+        logEnviron=False, haltOnFailure=True, workdir="build",
+        env=path_env, command=["make", "tout", "encyclo"]))
+    factory.addStep(steps.MasterShellCommand(command="rm -rf {}".format(E.AVENTURIERS_RELEASE_PATH)))
+    factory.addStep(steps.DirectoryUpload(workersrc="../build/html",
+        masterdest=E.AVENTURIERS_RELEASE_PATH,
+        url="https://aventuriers.syanni.eu"))
+    factory.addStep(steps.FileUpload(name="upload epub file", workersrc="aventuriers.epub",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.epub",
+        url="https://aventuriers.syanni.eu/aventuriers.epub", mode=0o644))
+    factory.addStep(steps.FileUpload(name="upload mobi file", workersrc="aventuriers.mobi",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.mobi",
+        url="https://aventuriers.syanni.eu/aventuriers.mobi", mode=0o644))
+    factory.addStep(steps.FileUpload(name="upload pdf file", workersrc="aventuriers.pdf",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/aventuriers.pdf",
+        url="https://aventuriers.syanni.eu/aventuriers.pdf", mode=0o644))
+    factory.addStep(steps.FileUpload(name="upload encyclo pdf file", workersrc="encyclo.pdf",
+        workdir="build", masterdest=E.AVENTURIERS_RELEASE_PATH + "/encyclo.pdf",
+        url="https://aventuriers.syanni.eu/encyclo.pdf", mode=0o644))
+    factory.addStep(steps.MasterShellCommand(command="chmod -R a+rX {}".format(E.AVENTURIERS_RELEASE_PATH)))
+
+    return util.BuilderConfig(name="DeniseAventuriers_build", workernames=["generic-worker-denise"], factory=factory)