[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: diffoscope distribution test: fail less noisy if diffoscope version in debian cannot be determined

[Holger Levsen]

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


Commits:
1e64a889 by Holger Levsen at 2020-06-16T13:21:38+02:00
diffoscope distribution test: fail less noisy if diffoscope version in debian cannot be determined

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

- - - - -
b5f23cdc by Holger Levsen at 2020-06-16T13:45:01+02:00
reproducible system health status: fix sorting order for failed jobs

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

- - - - -


3 changed files:

- bin/diffoscope_distribution_test.sh
- bin/reproducible_system_health.sh
- logparse/reproducible.rules


Changes:

=====================================
bin/diffoscope_distribution_test.sh
=====================================
@@ -116,6 +116,12 @@ do
 	fi
 done
 
+if [ "$DIFFOSCOPE_IN_DEBIAN" = "" ] ; then
+	echo "Warning: Cannot determine diffoscope version in Debian, aborting."
+	# don't fail the job if rmadison temporarily doesn't work
+	exit 0
+fi
+
 case $1 in
 	PyPI)	check_pypi
 		;;


=====================================
bin/reproducible_system_health.sh
=====================================
@@ -165,7 +165,7 @@ cat > $HEALTH_FILE.html <<- EOF
  <p>
   Failed jobs:
   <ul>
-   $(cat ${FAILED_JOBS} | sort -t '|' -n -r | cut -d '|' -f2-)
+   $(cat ${FAILED_JOBS} | sort -t '|' -n -r | cut -d '|' -f2- | sort)
   </ul>
  </p>
  <p>


=====================================
logparse/reproducible.rules
=====================================
@@ -34,4 +34,5 @@ warning /Warning: systemd is reporting errors/
 warning /Warning: .+ has wrong MTU, please tell the jenkins admins to fix this./
 warning /Warning: Problems analysing/
 warning /Warning: .+ .xiting cleanly as this is out-of-scope./
+warning /Warning: Cannot determine diffoscope version in Debian, aborting./
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/f238c7ed2eeb3191e90c507f5d4799d25b838dab...b5f23cdcb6a6c8ccef4f55abe1df3be8677a153c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/f238c7ed2eeb3191e90c507f5d4799d25b838dab...b5f23cdcb6a6c8ccef4f55abe1df3be8677a153c
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/20200616/ae488372/attachment-0001.html>