[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible fdroid: do not fail job when cleanup tasks fail

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
fba1d0cd by Hans-Christoph Steiner at 2020-10-29T17:01:55+01:00
reproducible fdroid: do not fail job when cleanup tasks fail

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
e2468146 by Holger Levsen at 2020-10-29T17:02:08+01:00
Revert "reproducible trbo system health check: detect failure do kill adb processes (during fdroid jobs)"

This reverts commit 6988a5575ff63fed98e3072d612ba5502ee22488.

- - - - -


4 changed files:

- bin/reproducible_fdroid_build_apps.sh
- bin/reproducible_fdroid_test.sh
- bin/reproducible_setup_fdroid_build_environment.sh
- bin/reproducible_system_health.sh


Changes:

=====================================
bin/reproducible_fdroid_build_apps.sh
=====================================
@@ -40,6 +40,7 @@ else
 fi
 
 cleanup_all() {
+    set +e
     echo "$(date -u) - cleanup in progress..."
     killall adb
     killall gpg-agent


=====================================
bin/reproducible_fdroid_test.sh
=====================================
@@ -40,6 +40,7 @@ else
 fi
 
 cleanup_all() {
+    set +e
     echo "$(date -u) - cleanup in progress..."
     killall adb
     killall gpg-agent


=====================================
bin/reproducible_setup_fdroid_build_environment.sh
=====================================
@@ -40,6 +40,7 @@ else
 fi
 
 cleanup_all() {
+    set +e
     echo "$(date -u) - cleanup in progress..."
     killall adb
     killall gpg-agent


=====================================
bin/reproducible_system_health.sh
=====================================
@@ -229,8 +229,6 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
 				small_note "node stopped responding"
 			elif $(grep -q "^unsupported host, exiting." $LOG) ; then
 				small_note "unsupported host (hostname changed?)"
-			elif $(grep -q "^adb: no process found" $LOG) ; then
-				small_note "'killall adb' failed"
 			else
 				small_note "generic SSH failure"
 			fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/815a72b2c9cfe58ef004d6406ea4146e2a4c95d5...e24681468b5f585b66e94ee5bb989115c317f55c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/815a72b2c9cfe58ef004d6406ea4146e2a4c95d5...e24681468b5f585b66e94ee5bb989115c317f55c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20201029/2803750a/attachment-0001.html>