summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-09-29 21:38:34 +0000
committerHolger Levsen <holger@layer-acht.org>2014-09-29 21:38:34 +0000
commitc40f3fec393a7ec8b3060ec55ec27bffb5a856a7 (patch)
treea83c85caccbec4be8180f687e3d7ce14bc0c55d7
parent5cc58bc4d8a7acf730e7f540d682b114d1a26483 (diff)
downloadjenkins.debian.net-c40f3fec393a7ec8b3060ec55ec27bffb5a856a7.tar.xz
reproducible: fix problem with epochs
-rwxr-xr-xbin/reproducible_build.sh26
-rwxr-xr-xbin/reproducible_stats.sh3
-rw-r--r--job-cfg/reproducible.yaml2
3 files changed, 17 insertions, 14 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 473f24e6..96560527 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -149,20 +149,22 @@ for SRCPACKAGE in ${PACKAGES} ; do
SKIPPED="${SRCPACKAGE} ${SKIPPED}"
continue
fi
- sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_*.dsc | tee ${SRCPACKAGE}_${VERSION}.pbuilder.log
- if [ -f /var/cache/pbuilder/result/${SRCPACKAGE}_${VERSION}_amd64.changes ] ; then
+ # EPOCH_FREE_VERSION was too long
+ EVERSION=$(echo $VERSION | cut -d ":" -f2)
+ sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_*.dsc | tee ${SRCPACKAGE}_${EVERSION}.pbuilder.log
+ if [ -f /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes ] ; then
mkdir b1 b2
- dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${VERSION}_amd64.changes b1
- sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${VERSION}_amd64.changes
+ dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b1
+ sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes
rm ${SRCPACKAGE}_*.pbuilder.log /var/lib/jenkins/userContent/pbuilder/${SRCPACKAGE}_*.pbuilder.log
- sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${VERSION}.dsc
- dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${VERSION}_amd64.changes b2
- sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${VERSION}_amd64.changes
+ sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${EVERSION}.dsc
+ dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b2
+ sudo dcmd rm /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes
set -e
- cat b1/${SRCPACKAGE}_${VERSION}_amd64.changes
- LOGFILE=$(ls ${SRCPACKAGE}_${VERSION}.dsc)
+ cat b1/${SRCPACKAGE}_${EVERSION}_amd64.changes
+ LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc)
LOGFILE=$(echo ${LOGFILE%.dsc}.diffp.log)
- ./misc.git/diffp b1/${SRCPACKAGE}_${VERSION}_amd64.changes b2/${SRCPACKAGE}_${VERSION}_amd64.changes | tee ./results/${LOGFILE}
+ ./misc.git/diffp b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes | tee ./results/${LOGFILE}
if ! $(grep -qv '^\*\*\*\*\*' ./results/${LOGFILE}) ; then
rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1
figlet ${SRCPACKAGE}
@@ -183,8 +185,8 @@ for SRCPACKAGE in ${PACKAGES} ; do
else
echo "Warning: ${SRCPACKAGE} failed to build from source."
sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"FTBFS\", \"$DATE\", \"\")"
- mv ${SRCPACKAGE}_${VERSION}.pbuilder.log /var/lib/jenkins/userContent/pbuilder/
- dcmd rm ${SRCPACKAGE}_${VERSION}.dsc
+ mv ${SRCPACKAGE}_${EVERSION}.pbuilder.log /var/lib/jenkins/userContent/pbuilder/
+ dcmd rm ${SRCPACKAGE}_${EVERSION}.dsc
fi
fi
diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh
index 4f043d3d..3d9b15a5 100755
--- a/bin/reproducible_stats.sh
+++ b/bin/reproducible_stats.sh
@@ -56,7 +56,8 @@ htmlecho
htmlecho "<p>$COUNT_UGLY packages failed to build from source: <code>"
for PKG in $UGLY ; do
VERSION=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT version FROM source_packages WHERE name = \"$PKG\"")
- # keep epoch
+ # remove epoch
+ VERSION=$(echo $VERSION | cut -d ":" -f2)
if [ -f "/var/lib/jenkins/userContent/pbuilder/${PKG}_${VERSION}.pbuilder.log" ] ; then
htmlecho "<a href=\"$JENKINS_URL/userContent/pbuilder/${PKG}_${VERSION}.pbuilder.log\">$PKG </a> "
else
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 8f70dcd4..64596c8f 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -275,7 +275,7 @@
my_description: 'Reproducible build of these server packages: '
my_timed: '42 23 6,21 * *'
my_shell: '/srv/jenkins/bin/reproducible_build.sh'
- my_packages: 'apache2 asterisk bind9 courier icinga icinga2 lighttpd munin mysql-5.5 nginx postfix exim4 sendmail postgresql squid squid3 roundcube openssh rsync nfs-utils bitlbee dropbear puppet cfengine2 ansible fai salt'
+ my_packages: 'apache2 asterisk bind9 courier icinga icinga2 lighttpd munin mysql-5.5 nginx postfix exim4 sendmail postgresql-9.4 squid squid3 roundcube openssh rsync nfs-utils bitlbee dropbear puppet cfengine2 ansible fai salt'
- '{name}_build_security-privacy':
my_description: 'Reproducible build of these security and privacy related packages: '
my_timed: '42 5 7,22 * *'