summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build-gluster-org/jobs/devrpms.yml4
-rw-r--r--build-gluster-org/jobs/rpm.yml4
-rw-r--r--build-gluster-org/scripts/rpm-cleanup.sh17
3 files changed, 25 insertions, 0 deletions
diff --git a/build-gluster-org/jobs/devrpms.yml b/build-gluster-org/jobs/devrpms.yml
index 48f7a6b..d18bc3e 100644
--- a/build-gluster-org/jobs/devrpms.yml
+++ b/build-gluster-org/jobs/devrpms.yml
@@ -58,6 +58,10 @@
publishers:
- rpm
+ - post-tasks:
+ - matches:
+ - log-text: Build was aborted
+ script: !include-raw: ../scripts/rpm-cleanup.sh
builders:
- shell: !include-raw: ../scripts/glusterfs-devrpms.sh
diff --git a/build-gluster-org/jobs/rpm.yml b/build-gluster-org/jobs/rpm.yml
index 5292771..020c402 100644
--- a/build-gluster-org/jobs/rpm.yml
+++ b/build-gluster-org/jobs/rpm.yml
@@ -51,6 +51,10 @@
publishers:
- rpm
+ - post-tasks:
+ - matches:
+ - log-text: Build was aborted
+ script: !include-raw: ../scripts/rpm-cleanup.sh
builders:
- shell: !include-raw: ../scripts/glusterfs-rpms.sh
diff --git a/build-gluster-org/scripts/rpm-cleanup.sh b/build-gluster-org/scripts/rpm-cleanup.sh
new file mode 100644
index 0000000..bd300c7
--- /dev/null
+++ b/build-gluster-org/scripts/rpm-cleanup.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+pkill mock || true
+SLEEP=0
+while [ $SLEEP -lt 30 ]
+do
+ echo "Waiting for mock to exit cleanly. Attempt #: $SLEEP"
+ sleep 1
+ pgrep -x mock
+ if [ $? -eq 1 ]
+ then
+ exit 0
+ fi
+ SLEEP=$((SLEEP+1))
+done
+echo "Force-killing mock"
+pkill -9 mock