buildpackages: allow for more parallel builds

Builds are in parallel if the OS type / version and the SHA1 are
different. Having just one build at a time for a given SHA1 slows thing
down when there are more than a few supported OS.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/tasks/buildpackages.py b/tasks/buildpackages.py
index 35546609d86d09410182558c80f80917974d3a5e..8317e704af1c9d2d4779a4b8c670740ad56eb021 100644 (file)
--- a/tasks/buildpackages.py
+++ b/tasks/buildpackages.py
@@ -167,8 +167,9 @@ def task(ctx, config):
             'ram': 1024, # MB
             'cpus': 1,
         }, select)
+        lock = "/tmp/buildpackages-" + sha1 + "-" + os_type + "-" + os_version
         cmd = (". " + os.environ['HOME'] + "/.ssh_agent ; " +
-               " flock --close /tmp/buildpackages-" + sha1 +
+               " flock --close " + lock +
                " make -C " + d +
                " CEPH_GIT_URL=" + teuth_config.get_ceph_git_url() +
                " CEPH_PKG_TYPE=" + pkg_type +