[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: reproducible debian: _html_repository_comparison: drop special case for…
Mattia Rizzolo
gitlab at salsa.debian.org
Tue May 15 18:10:42 BST 2018
Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net
Commits:
4cc3477e by Mattia Rizzolo at 2018-05-15T18:59:12+02:00
reproducible debian: _html_repository_comparison: drop special case for debbindiff (!!!) and strip-nd/diffoscope/disorderfs: we are not going to upload them to the repo anymore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
ce1bb825 by Mattia Rizzolo at 2018-05-15T19:06:17+02:00
reproducible debian: _html_repository_comparison: drop another special casing for our own packages
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
33afb85f by Eli Schwartz at 2018-05-15T19:10:08+02:00
Fix filepaths for cleaning up the old build files
$SRCPACKAGE was not set for the html jobs, fix by switching to the exisiting variable for
the directory we're trying to use.
Also deduplicate some logic using pushd for convenience.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
3b6edca5 by Eli Schwartz at 2018-05-15T19:10:08+02:00
Replace several occurrences of parsing ls with cut, by the date command
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
4 changed files:
- bin/reproducible_build_rpm.sh
- bin/reproducible_html_archlinux.sh
- bin/reproducible_html_repository_comparison.sh
- bin/reproducible_html_rpms.sh
Changes:
=====================================
bin/reproducible_build_rpm.sh
=====================================
--- a/bin/reproducible_build_rpm.sh
+++ b/bin/reproducible_build_rpm.sh
@@ -47,7 +47,7 @@ update_mock() {
echo "$(date -u ) - yum updated."
touch $STAMP
else
- echo "$(date -u ) - mock and yum not updated, last update was at $(TZ=UTC ls --full-time $STAMP | cut -d ' ' -f6-7 | cut -d '.' -f1) UTC."
+ echo "$(date -u ) - mock and yum not updated, last update was at $(date -u --date=@$(stat -c %Y $STAMP) +'%F %T') UTC."
fi
rm $DUMMY > /dev/null
}
@@ -258,4 +258,3 @@ echo "$(date -u) - $REPRODUCIBLE_URL/rpms/$RELEASE/$ARCH/$SRCPACKAGE/ updated."
cd
cleanup_all
trap - INT TERM EXIT
-
=====================================
bin/reproducible_html_archlinux.sh
=====================================
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -20,7 +20,7 @@ create_pkg_state_and_html() {
if [ -z "$(cd $ARCHLINUX_PKG_PATH ; ls)" ] ; then
# directory exists but is empty: package is building…
- echo "$(date -u ) - ignoring $PKG from '$REPOSITORY' which is building in $ARCHLINUX_PKG_PATH since $(LANG=C TZ=UTC ls --full-time -d $ARCHLINUX_PKG_PATH | cut -d ':' -f1-2 | cut -d " " -f6-) UTC"
+ echo "$(date -u ) - ignoring $PKG from '$REPOSITORY' which is building in $ARCHLINUX_PKG_PATH since $(date -u --date=@$(stat -c %Y $ARCHLINUX_PKG_PATH) +'%F %R') UTC"
return
fi
@@ -172,7 +172,7 @@ create_pkg_state_and_html() {
esac
fi
echo " </td>" >> $HTML_BUFFER
- local BUILD_DATE="$(LANG=C TZ=UTC ls --full-time $ARCHLINUX_PKG_PATH/build1.log | cut -d ':' -f1-2 | cut -d " " -f6- )"
+ local BUILD_DATE="$(date -u --date=@$(stat -c %Y $ARCHLINUX_PKG_PATH/build1.log) +'%F %R')"
if [ ! -z "$BUILD_DATE" ] ; then
BUILD_DATE="$BUILD_DATE UTC"
fi
@@ -204,19 +204,14 @@ create_pkg_state_and_html() {
chmod 644 $ARCHLINUX_PKG_PATH/pkg.html
# clear files from previous builds
- for file in build1.log build2.log build1.version build2.version ; do
- if [ -f $BASE/archlinux/$REPO/$SRCPACKAGE/$file ] && [ $BASE/archlinux/$REPO/$SRCPACKAGE/pkg.build_duration -nt $BASE/archlinux/$REPO/$SRCPACKAGE/$file ] ; then
- rm $BASE/archlinux/$REPO/$SRCPACKAGE/$file
- echo "$BASE/archlinux/$REPO/$SRCPACKAGE/$file older than $BASE/archlinux/$REPO/$SRCPACKAGE/pkg.build_duration, thus deleting it."
- fi
- done
- for file in $BASE/archlinux/$REPO/$SRCPACKAGE/*BUILDINFO.txt $BASE/archlinux/$REPO/$SRCPACKAGE/*html ; do
- if [ -f $file ] && [ $BASE/archlinux/$REPO/$SRCPACKAGE/pkg.build_duration -nt $file ] ; then
- echo "$file older than $BASE/archlinux/$REPO/$SRCPACKAGE/pkg.build_duration, thus deleting it."
+ pushd "$ARCHLINUX_PKG_PATH"
+ for file in build1.log build2.log build1.version build2.version *BUILDINFO.txt *.html; do
+ if [ -f $file ] && [ pkg.build_duration -nt $file ] ; then
rm $file
+ echo "$ARCHLINUX_PKG_PATH/$file older than $ARCHLINUX_PKG_PATH/pkg.build_duration, thus deleting it."
fi
done
-
+ popd
}
#
=====================================
bin/reproducible_html_repository_comparison.sh
=====================================
--- a/bin/reproducible_html_repository_comparison.sh
+++ b/bin/reproducible_html_repository_comparison.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# vim: set noexpandtab:
# Copyright 2015-2017 Holger Levsen <holger at layer-acht.org>
# released under the GPLv=2
@@ -155,15 +156,7 @@ for PKG in $SOURCEPKGS ; do
write_row "<tr><td><pre>src:$PKG</pre></td>"
write_row " <td>"
GIT="$PKG.git"
- case $PKG in
- debbindiff)
- URL="https://anonscm.debian.org/git/reproducible/diffoscope.git"
- GIT="diffoscope.git" ;;
- strip-nondeterminism|diffoscope|disorderfs)
- URL="https://anonscm.debian.org/git/reproducible/$GIT" ;;
- *)
- URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=pu/reproducible_builds" ;;
- esac
+ URL="https://anonscm.debian.org/git/reproducible/$GIT/?h=pu/reproducible_builds" ;;
custom_curl $URL $TMPFILE
if [ "$(grep "'error'>No repositories found" $TMPFILE 2>/dev/null)" ] ; then
write_row "<span class=\"red\">no git repository found:</span><br />$URL"
@@ -190,20 +183,14 @@ for PKG in $SOURCEPKGS ; do
fi
else
write_row "<a href=\"$URL\">$GIT</a>"
- if [ "$PKG" != "strip-nondeterminism" ] && [ "$PKG" != "diffoscope" ] && [ "$PKG" != "debbindiff" ] && [ "$PKG" != "disorderfs" ] ; then
- if $OBSOLETE_IN_BUSTER && $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then
- write_row "<br />(unused?"
- write_row "<br /><span class=\"purple\">Then the branch should probably renamed.</span>)"
- elif $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then
- write_row "<br />(only used in buster, fixed in sid,"
- write_row "<br /><span class=\"purple\">branch probably either should be renamed to <em>merged/reproducible_builds</em> or a new upload to our repo is needed?</span>)"
- elif $OBSOLETE_IN_EXP ; then
- write_row "<br />(only used in buster and unstable, fixed in experimental)"
- fi
- elif [ "$PKG" = "disorderfs" ] ; then
- write_row "<br />(only used to modify the build environment in the 2nd build)"
- elif [ "$PKG" = "debbindiff" ] && $OBSOLETE_IN_SID ; then
- write_row "<br />(debbindiff has been renamed to diffoscope)"
+ if $OBSOLETE_IN_BUSTER && $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then
+ write_row "<br />(unused?"
+ write_row "<br /><span class=\"purple\">Then the branch should probably renamed.</span>)"
+ elif $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then
+ write_row "<br />(only used in buster, fixed in sid,"
+ write_row "<br /><span class=\"purple\">branch probably either should be renamed to <em>merged/reproducible_builds</em> or a new upload to our repo is needed?</span>)"
+ elif $OBSOLETE_IN_EXP ; then
+ write_row "<br />(only used in buster and unstable, fixed in experimental)"
fi
fi
if ! $OBSOLETE_IN_SID ; then
=====================================
bin/reproducible_html_rpms.sh
=====================================
--- a/bin/reproducible_html_rpms.sh
+++ b/bin/reproducible_html_rpms.sh
@@ -77,7 +77,7 @@ for PKG in $(find $RPMBASE/$RELEASE/$ARCH/* -maxdepth 1 -type d -exec basename {
done
fi
echo " </td>" >> $HTML_BUFFER
- echo " <td>$(LANG=C TZ=UTC ls --full-time $RPM_PKG_PATH/build1.log | cut -d ' ' -f6 )</td>" >> $HTML_BUFFER
+ echo " <td>$(date -u --date=@$(stat -c %Y $RPM_PKG_PATH/build1.log) +%F)</td>" >> $HTML_BUFFER
for LOG in build1.log build2.log ; do
if [ -f $RPM_PKG_PATH/$LOG ] ; then
get_filesize $RPM_PKG_PATH/$LOG
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/825ae02965174190513c4bad6f4203287069aef8...3b6edca5eac79687a6356800b60bd9914f22a42f
---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/825ae02965174190513c4bad6f4203287069aef8...3b6edca5eac79687a6356800b60bd9914f22a42f
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/20180515/779e4432/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list