reproducible: very few packages have their spectactularily failing wheezy version in sids sources.list, so more carefully try to guess the latest version in sid... test said package again too...

2 files changed, 6 insertions, 4 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 6c3fe696..acfec3b6 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -68,7 +68,7 @@ if [[ $1 =~ ^-?[0-9]+$ ]] ; then
 		REAL_AMOUNT=0
 		GUESSES=$(echo "${AMOUNT}*3" | bc)
 		PACKAGES=""
-		CANDIDATES=$(xzcat $TMPFILE | grep "^Package" | grep -v "^Package-List:" |  cut -d " " -f2 | egrep -v "^(linux$|util-linux)$" | sort -R | head -$GUESSES | xargs echo)
+		CANDIDATES=$(xzcat $TMPFILE | grep "^Package" | grep -v "^Package-List:" |  cut -d " " -f2 | egrep -v "^linux$" | sort -R | head -$GUESSES | xargs echo)
 		for PKG in $CANDIDATES ; do
 			if [ $REAL_AMOUNT -eq $AMOUNT ] ; then
 				continue
@@ -138,7 +138,7 @@ for SRCPACKAGE in ${PACKAGES} ; do
 	rm b1 b2 -rf
 	set +e
 	DATE=$(date +'%Y-%m-%d %H:%M')
-	VERSION=$(apt-cache showsrc ${SRCPACKAGE} | grep ^Version | cut -d " " -f2 | head -1)
+	VERSION=$(apt-cache showsrc ${SRCPACKAGE} | grep ^Version | cut -d " " -f2 | sort -r | head -1)
 	# check if we tested this version already before...
 	STATUS=$(sqlite3 ${PACKAGES_DB} "SELECT status FROM source_packages WHERE name = \"${SRCPACKAGE}\" AND version = \"${VERSION}\"")
 	# if reproducible or ( unreproducible/FTBFS by 50% chance )
@@ -148,13 +148,15 @@ for SRCPACKAGE in ${PACKAGES} ; do
 		SKIPPED="${SRCPACKAGE} ${SKIPPED}"
 		continue
 	fi
-	apt-get source --download-only --only-source ${SRCPACKAGE}=${VERSION}
+	# host has only sid in deb-src in sources.list
+	apt-get source --download-only --only-source ${SRCPACKAGE}
 	RESULT=$?
 	if [ $RESULT != 0 ] ; then
 		SOURCELESS="${SOURCELESS} ${SRCPACKAGE}"
 		echo "Warning: ${SRCPACKAGE} is not a source package, or was removed or renamed. Please investigate."
 		sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"404\", \"$DATE\", \"\")"
 	else
+		VERSION=$(grep "^Version: " ${SRCPACKAGE}_*.dsc| head -1 | cut -d ":" -f2-)
 		ARCH=$(grep "^Architecture: " ${SRCPACKAGE}_*.dsc| cut -d ":" -f2)
 		if [[ ! "$ARCH" =~ "amd64" ]] && [[ ! "$ARCH" =~ "all" ]] && [[ ! "$ARCH" =~ "any" ]] ; then
 			sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"not for us\", \"$DATE\", \"\")"
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 60331100..5b3841ba 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -220,7 +220,7 @@
             my_description: 'Reproducible build of all the core packages as defined by UDD as described in https://wiki.debian.org/ReproducibleBuilds so these: '
             my_timed: '42 5 1,16 * *'
             my_shell: '/srv/jenkins/bin/reproducible_build.sh'
-            my_packages: 'acl adduser attr audit base-files base-passwd bash binutils bsdmainutils bzip2 cdebconf cloog coreutils cryptsetup dash db5.3 dbus debconf debhelper debianutils dh-buildinfo diffutils dpkg e2fsprogs eglibc file findutils gcc-4.9 gcc-defaults gdbm gettext glib2.0 glibc gmp grep groff gzip hostname init-system-helpers insserv intltool-debian isl kmod libcap2 libcroco libffi libgcrypt11 libgcrypt20 libgpg-error libintl-perl libpipeline libselinux libsemanage libsepol libtext-unidecode-perl libtimedate-perl libunistring libxml2 libxml-libxml-perl libxml-namespacesupport-perl libxml-sax-base-perl libxml-sax-perl linux lsb lvm2 make-dfsg man-db mawk mpclib3 mpfr4 ncurses pam patch pcre3 perl po-debconf procps sed sensible-utils shadow startpar systemd sysvinit tar tcp-wrappers texinfo tzdata ucf ustr xz-utils zlib'  # util-linux was removed as its spawns a m4 process which eats 40gb ram
+            my_packages: 'acl adduser attr audit base-files base-passwd bash binutils bsdmainutils bzip2 cdebconf cloog coreutils cryptsetup dash db5.3 dbus debconf debhelper debianutils dh-buildinfo diffutils dpkg e2fsprogs eglibc file findutils gcc-4.9 gcc-defaults gdbm gettext glib2.0 glibc gmp grep groff gzip hostname init-system-helpers insserv intltool-debian isl kmod libcap2 libcroco libffi libgcrypt11 libgcrypt20 libgpg-error libintl-perl libpipeline libselinux libsemanage libsepol libtext-unidecode-perl libtimedate-perl libunistring libxml2 libxml-libxml-perl libxml-namespacesupport-perl libxml-sax-base-perl libxml-sax-perl linux lsb lvm2 make-dfsg man-db mawk mpclib3 mpfr4 ncurses pam patch pcre3 perl po-debconf procps sed sensible-utils shadow startpar systemd sysvinit tar tcp-wrappers texinfo tzdata ucf ustr util-linux xz-utils zlib'
         - '{name}_build_build-tools':
             my_description: 'Reproducible build packages which are used to build other packages.<br>Source packages to be build: '
             my_timed: '42 23 1,16 * *'