Add a NixShellCommand step to buildbot

[perso/Immae/Config/Nix.git] / modules / private / buildbot / projects / immaeEu / __init__.py

diff --git a/modules/private/buildbot/projects/immaeEu/__init__.py b/modules/private/buildbot/projects/immaeEu/__init__.py
index 575f083502f82e1784a10883dae0b29a9a412a7f..f119b4f2d2a49f3166a4399b0c1eaff1c755aec8 100644 (file)
--- a/modules/private/buildbot/projects/immaeEu/__init__.py
+++ b/modules/private/buildbot/projects/immaeEu/__init__.py
@@ -22,14 +22,14 @@ class E():
     COURS_GIT_URL      = "gitolite@git.immae.eu:perso/Immae/Sites/Cours"
     NORMALESUP_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Projets/Sites/Normalesup"
 
-    COURS_RELEASE_PATH      = "/var/lib/buildbot/outputs/cours"
+    COURS_RELEASE_PATH      = "/var/lib/buildbot/outputs/immae/cours"
     COURS_TARBALL_PATH      = "/var/lib/ftp/release.immae.eu/cours"
     COURS_TARBALL_URL       = "https://release.immae.eu/cours"
-    BIP39_RELEASE_PATH      = "/var/lib/buildbot/outputs/bip39"
+    BIP39_RELEASE_PATH      = "/var/lib/buildbot/outputs/immae/bip39"
     HISTORY_RELEASE_PATH    = "/var/lib/buildbot/outputs/immae/history"
-    IMMAE_EU_RELEASE_PATH   = "/var/lib/buildbot/outputs/immaeEu"
-    RECETTES_RELEASE_PATH   = "/var/lib/buildbot/outputs/recettes"
-    NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/recherche"
+    IMMAE_EU_RELEASE_PATH   = "/var/lib/buildbot/outputs/immae/blog"
+    RECETTES_RELEASE_PATH   = "/var/lib/buildbot/outputs/immae/recettes"
+    NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/recherche"
     GSMCELLS_RELEASE_PATH   = "/var/lib/ftp/release.immae.eu/gsm_cells"
     GSMCELLS_RELEASE_URL    = "https://release.immae.eu/gsm_cells"
 
@@ -147,9 +147,9 @@ def recettes_factory():
     factory.addStep(steps.Git(logEnviron=False, repourl=E.RECETTES_GIT_URL,
         submodules=True, sshPrivateKey=open(E.SSH_KEY_PATH).read().rstrip(),
         sshHostKey=E.SSH_HOST_KEY, mode="full", method="copy"))
-    factory.addStep(steps.ShellCommand(name="build website",
+    factory.addStep(NixShellCommand(name="build website",
         logEnviron=False, haltOnFailure=True, workdir="source",
-        env=path_env, command=["jekyll", "build", "--baseurl", "/recettes"]))
+        env=path_env, command="jekyll build --trace --baseurl /recettes"))
     factory.addStep(steps.MasterShellCommand(command="rm -rf {}".format(E.RECETTES_RELEASE_PATH)))
     factory.addStep(steps.DirectoryUpload(workersrc="../source/_site",
         masterdest=E.RECETTES_RELEASE_PATH,