summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-12-18 13:26:33 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-18 13:26:33 +0100
commitd975ff1c678e941012fbc3b339fddb987dd53af3 (patch)
tree7ccd2dc86b56dc9b60e29604f127b33f312c6ff7 /bin
parent4ca0a862db2ae24bbe814d2785133aea0545fb63 (diff)
downloadjenkins.debian.net-d975ff1c678e941012fbc3b339fddb987dd53af3.tar.xz
reproducible archlinux: better detect pgp problems
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_html_archlinux.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index eb9257bb..c85769c5 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -20,7 +20,7 @@ for i in 0 1 2 3 4 ; do
done
HTML_FTBR=$(mktemp -t rhtml-archlinux-XXXXXXXX)
HTML_DEPWAIT=$(mktemp -t rhtml-archlinux-XXXXXXXX)
-for i in 0 1 ; do
+for i in 0 1 2 ; do
HTML_404[$i]=$(mktemp -t rhtml-archlinux-XXXXXXXX)
done
HTML_GOOD=$(mktemp -t rhtml-archlinux-XXXXXXXX)
@@ -55,15 +55,17 @@ for REPOSITORY in $ARCHLINUX_REPOS ; do
let NR_DEPWAIT+=1
echo " <img src=\"/userContent/static/weather-snow.png\" alt=\"depwait icon\" /> could not resolve dependencies" >> $HTML_BUFFER
elif [ ! -z "$(egrep '(==> ERROR: Failure while downloading|==> ERROR: One or more PGP signatures could not be verified)' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
+ HTML_TARGET=${HTML_404[0]}
+ EXTRA_REASON=""
let NR_404+=1
if [ ! -z "$(grep 'FAILED (unknown public key' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
- HTML_TARGET=${HTML_404[0]}
- EXTRA_REASON="(unknown public key)"
- else
HTML_TARGET=${HTML_404[1]}
- EXTRA_REASON=""
+ EXTRA_REASON="(failed to verify source with PGP due to unknown public key)"
+ elif [ ! -z "$(egrep '==> ERROR: One or more PGP signatures could not be verified' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
+ HTML_TARGET=${HTML_404[2]}
+ EXTRA_REASON="(failed to verify source with PGP signatures)"
fi
- echo " <img src=\"/userContent/static/weather-severe-alert.png\" alt=\"404 icon\" /> failed to verify source with PGP signatures $EXTRA_REASON" >> $HTML_BUFFER
+ echo " <img src=\"/userContent/static/weather-severe-alert.png\" alt=\"404 icon\" /> download failed $EXTRA_REASON" >> $HTML_BUFFER
elif [ ! -z "$(egrep '==> ERROR: One or more files did not pass the validity check' $ARCHBASE/$REPOSITORY/$PKG/build1.log)" ] ; then
HTML_TARGET=${HTML_FTBFS[0]}
let NR_FTBFS+=1
@@ -160,7 +162,7 @@ cat $HTML_REPOSTATS >> $PAGE
rm $HTML_REPOSTATS > /dev/null
write_page " </table>"
write_page " <table><tr><th>repository</th><th>source package</th><th>test result</th><th>test date</th><th>1st build log</th><th>2nd build log</th></tr>"
-for i in $HTML_UNKNOWN $(for j in 0 1 ; do echo ${HTML_404[$j]} ; done) $HTML_DEPWAIT $(for j in 0 1 2 3 4 ; do echo ${HTML_FTBFS[$j]} ; done) $HTML_FTBR $HTML_GOOD ; do
+for i in $HTML_UNKNOWN $(for j in 0 1 2 ; do echo ${HTML_404[$j]} ; done) $HTML_DEPWAIT $(for j in 0 1 2 3 4 ; do echo ${HTML_FTBFS[$j]} ; done) $HTML_FTBR $HTML_GOOD ; do
cat $i >> $PAGE
rm $i > /dev/null
done