[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian rebuilder prototype: deal with .buildinfo file being created in current dir

[Holger Levsen]

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


Commits:
1bd8c899 by Holger Levsen at 2021-01-20T17:33:59+01:00
reproducible Debian rebuilder prototype: deal with .buildinfo file being created in current dir

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

- - - - -


1 changed file:

- bin/reproducible_debian_rebuilder_prototype.sh


Changes:

=====================================
bin/reproducible_debian_rebuilder_prototype.sh
=====================================
@@ -153,6 +153,7 @@ else
 	output_echo  "$URLPATH/$FILE is unsigned:"
 fi
 cat $FILE
+mv $FILE ..
 
 # download the source early to fail early if it's not available...
 output_echo "fetching source package $PKG ($VERSION)"
@@ -168,7 +169,7 @@ DEBREBUILD=$(mktemp -t debrebuild-cmd.XXXXXXXX)
 output_echo "trying to debrebuild $PKG ($BINARY_VERSION), which means building instructions how to re-create the build environment as specified in $URLPATH/$FILE"
 # workaround: we are using rb-debrebuild here which is a code copy from debrebuild from devscripts.git
 # using --no-respect-build-path is a workaround until sbuild 0.81 is available. see https://salsa.debian.org/debian/devscripts/-/merge_requests/203#note_192500
-/srv/jenkins/bin/rb-debrebuild --timestamp=metasnap --no-respect-build-path $FILE 2>&1 | tee $DEBREBUILD
+/srv/jenkins/bin/rb-debrebuild --timestamp=metasnap --no-respect-build-path ../$FILE 2>&1 | tee $DEBREBUILD
 
 # FIXME: file a bug like '#955123 debrebuild: please provide --sbuild-output-only option' but with --output-only-base-release
 # (parsing the debrebuild output to gather this information is way to fragile)
@@ -210,9 +211,6 @@ else
 	echo 'Acquire::Check-Valid-Until "false";' | sudo tee /schroots/debrebuild-$DISTRO-$ARCH/etc/apt/apt.conf.d/23-rebuild
 fi
 
-# a successful build might overwrite the original .buildinfo file, so move it away
-mv $FILE $FILE.orig
-
 # actually run sbuild
 # - workaround #955123 in devscripts: debrebuild: please provide --sbuild-output-only option
 #   - using tail
@@ -244,7 +242,7 @@ set -e
 output_echo "File artifacts:"
 ls -lart
 output_echo "Diff between .buildinfo files:"
-diff $FILE.orig $FILE || true
+diff ../$FILE $FILE || true
 output_echo "The following binary packages could be rebuilt bit-by-bit identical to the ones distributed from ftp.debian.org:"
 # FIXME: this is irrelevant. instead the status of packages in the buildinfo file should be computed
 # (not the once we just build...)



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1bd8c89994578f12bb9430f6d69a5b066fb4264a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1bd8c89994578f12bb9430f6d69a5b066fb4264a
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/20210120/19342395/attachment-0001.html>