flock against concurrent reprepro operations

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index ea1359417e59af241e325e5f5c9a7c6986e766ba..78c780c872192ba7ed0471ef8cc9a22b72636b6d 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -571,6 +571,11 @@
                         which-build: upstream-build
                         fallback-to-last-successful: true
                 - shell: 'dput-pgdg $queue'
+        publishers:
+                - ircbot:
+                        matrix-notifier: only-parent
+                        message-type: summary-params
+                - groovy-postbuild: 'manager.addShortText("${manager.build.environment.binaries} (${manager.build.environment.queue})")'
 
 #- job:
 #        name: promote

diff --git a/repo/processincoming b/repo/processincoming
index 27d58ce8724c3f4feee2b76a0580bd7e15a3c1cb..650d81d77debfa73fbab7dcd58cbd35d0cbf2218 100755 (executable)
--- a/repo/processincoming
+++ b/repo/processincoming
@@ -4,4 +4,5 @@ QUEUE="${1:-incoming}"
 [ "$QUEUE" = "incoming" ] || exit 0
 REPREPRO_BASE_DIR="/srv/apt/repo"
 
+flock "$REPREPRO_BASE_DIR/db/.lock" \
 /usr/bin/reprepro -b "$REPREPRO_BASE_DIR" --morguedir "$REPREPRO_BASE_DIR/morgue" --verbose processincoming pgdg

diff --git a/repo/promote b/repo/promote
index c0a1621cd499d7fc5f91de2b942b31773087f206..a7f7a8aa553a843391a53c30248ee07cdc893087 100755 (executable)
--- a/repo/promote
+++ b/repo/promote
@@ -6,7 +6,7 @@ set -eu
 
 [ "$USER" = "aptuser" ] || SUDO="sudo -u aptuser"
 export REPREPRO_BASE_DIR="/srv/apt/repo"
-REPREPRO="reprepro -b $REPREPRO_BASE_DIR --morguedir $REPREPRO_BASE_DIR/morgue --verbose"
+REPREPRO="flock $REPREPRO_BASE_DIR/db/.lock /usr/bin/reprepro -b $REPREPRO_BASE_DIR --morguedir $REPREPRO_BASE_DIR/morgue --verbose"
 DISTS="all"
 
 if [ "${DEBUG:-}" ]; then