bin/common-functions.sh

@@ -12,6 +12,7 @@ common_cleanup() {
 
 abort_if_bug_is_still_open() {
 	local TMPFILE=$(mktemp --tmpdir=/tmp jenkins-bugcheck-XXXXXXX)
+	echo "$(date -u) - checking bug #$1 status."
 	bts status $1 fields:done > $TMPFILE || true
 	# if we get a valid response…
 	if [ ! -z "$(grep done $TMPFILE)" ] ; then
@@ -61,16 +62,12 @@ if [ "${0:0:5}" != "/tmp/" ] ; then
 		#	for BLOCKER in 869155 867695 ; do
 		#		abort_if_bug_is_still_open $BLOCKER
 		#	done ;;
-		chroot-installation_sid_install_parl-desktop-eu)
+		chroot-installation_sid_install_parl*|chroot-installation_buster_install_parl-*)
 			abort_if_bug_is_still_open 886676 ;;
-		chroot-installation_sid_install_parl-desktop-world)
-			abort_if_bug_is_still_open 886676 ;;
-		chroot-installation_buster_install_parl-*)
-			abort_if_bug_is_still_open 886676 ;;
-		chroot-installation_buster_install_design-desktop-animation)
-			# technically these two bugs dont affect design-desktop-animation
+		chroot-installation_buster_install_design*)
+			# technically these two bugs dont affect design-desktop
 			# but just a depends of it, however I don't think it's likely
-			# design-desktop-animation will enter buster without these two bugs being fixed
+			# design-desktop will enter buster without these two bugs being fixed
 			abort_if_bug_is_still_open 890754
 			abort_if_bug_is_still_open 879034 ;;
 		*) ;;