[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fdroid: update cleanup_all to kill random daemons leftover

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 874ff3e9692a2d1e7ac7851f7462338ec660217a
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Dec 20 13:27:52 2017 +0100

    reproducible fdroid: update cleanup_all to kill random daemons leftover
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_fdroid_build_apps.sh              | 8 ++++----
 bin/reproducible_fdroid_test.sh                    | 4 +++-
 bin/reproducible_setup_fdroid_build_environment.sh | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh
index 5f69573..b3803d9 100755
--- a/bin/reproducible_fdroid_build_apps.sh
+++ b/bin/reproducible_fdroid_build_apps.sh
@@ -39,10 +39,10 @@ else
 fi
 
 cleanup_all() {
-	echo "$(date -u) - cleanup in progress..."
-	killall VBoxHeadless || true
-	sleep 10
-	echo "$(date -u) - cleanup done."
+    echo "$(date -u) - cleanup in progress..."
+    killall adb
+    killall gpg-agent
+    echo "$(date -u) - cleanup done."
 }
 trap cleanup_all INT TERM EXIT
 
diff --git a/bin/reproducible_fdroid_test.sh b/bin/reproducible_fdroid_test.sh
index 4ccc8a1..aad1374 100755
--- a/bin/reproducible_fdroid_test.sh
+++ b/bin/reproducible_fdroid_test.sh
@@ -39,7 +39,9 @@ else
 fi
 
 cleanup_all() {
-    # no long lived processes, nothing to be done
+    echo "$(date -u) - cleanup in progress..."
+    killall adb
+    killall gpg-agent
     echo "$(date -u) - cleanup done."
 }
 trap cleanup_all INT TERM EXIT
diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index 775ed67..9f4d2ac 100755
--- a/bin/reproducible_setup_fdroid_build_environment.sh
+++ b/bin/reproducible_setup_fdroid_build_environment.sh
@@ -39,10 +39,10 @@ else
 fi
 
 cleanup_all() {
-	echo "$(date -u) - cleanup in progress..."
-	killall VBoxHeadless || true
-	sleep 10
-	echo "$(date -u) - cleanup done."
+    echo "$(date -u) - cleanup in progress..."
+    killall adb
+    killall gpg-agent
+    echo "$(date -u) - cleanup done."
 }
 trap cleanup_all INT TERM EXIT
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git