buildpackages: allow for concurrent build if != sha1

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit a630da722008278969bcdbbdf8a1e26169653fa7)

diff --git a/tasks/buildpackages.py b/tasks/buildpackages.py
index fe2165dbfce7b681c8ff869bb265d887ba435cce..47ba2d8224795441b5f6a12b50e06e3d8bd1e0d6 100644 (file)
--- a/tasks/buildpackages.py
+++ b/tasks/buildpackages.py
@@ -100,7 +100,9 @@ def task(ctx, config):
             'ram': 1024, # MB
             'cpus': 1,
         }, select)
-        cmd = (". " + os.environ['HOME'] + "/.ssh_agent ; flock --close /tmp/buildpackages make -C " + d +
+        cmd = (". " + os.environ['HOME'] + "/.ssh_agent ; " +
+               " flock --close /tmp/buildpackages-" + sha1 +
+               " make -C " + d +
                " CEPH_GIT_URL=" + teuth_config.get_ceph_git_url() +
                " CEPH_PKG_TYPE=" + gitbuilder.pkg_type +
                " CEPH_OS_TYPE=" + gitbuilder.os_type +