[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian rebuilder 'thing': stop exporting variables

[Holger Levsen]

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


Commits:
093f71de by Holger Levsen at 2020-05-01T16:17:32+02:00
reproducible Debian rebuilder 'thing': stop exporting variables

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

- - - - -
8227eec2 by Holger Levsen at 2020-05-01T16:19:01+02:00
reproducible Debian: temporarily disable pool_buildinfos job to manually recreate to confirm there are not more than 3 .buildinfo files with the same name

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

- - - - -


2 changed files:

- bin/reproducible_debian_rebuilder_prototype.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/reproducible_debian_rebuilder_prototype.sh
=====================================
@@ -57,21 +57,22 @@ SUITE=bullseye
 DISTNAME="$SUITE-$ARCH"
 PACKAGES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_binary-${ARCH}_Packages)
 SOURCES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_source_Sources)
-export PKG=$(grep-available . -s Package $PACKAGES | sort -R | head -1 | cut -d ' ' -f2)
-export VERSION=$(grep-available -S $PKG -s Version $SOURCES | head -1 | cut -d ' ' -f2)
+PKG=$(grep-available . -s Package $PACKAGES | sort -R | head -1 | cut -d ' ' -f2)
+VERSION=$(grep-available -S $PKG -s Version $SOURCES | head -1 | cut -d ' ' -f2)
 output_echo "let's try to rebuild $PKG ($VERSION) from $SUITE/$ARCH"
 
 # query a random .buildinfo file path (for that $PKG and $VERSION from bullseye...) from builtin-pho db
-export BUILTINPHOPATH=$(psql -A -t -c "SELECT path FROM builds WHERE source='$PKG' AND source_version='$VERSION' AND arch_amd64=true OR arch_all=true LIMIT 1" buildinfo)
+BUILTINPHOPATH=$(psql -A -t -c "SELECT path FROM builds WHERE source='$PKG' AND source_version='$VERSION' AND arch_amd64=true OR arch_all=true LIMIT 1" buildinfo)
 if [ -z "$BUILTINPHOPATH" ] ; then
 	output_echo "No .buildinfo file found for $PKG ($VERSION) for $ARCH"
 	output_echo ".buildinfo files known for $PKG and (arch_amd64 or arch_all)"
 	psql -A -t -c "SELECT path FROM builds WHERE source='$PKG' AND (arch_amd64=true OR arch_all=true)" buildinfo
 	exit 1
 fi
-export FILE="$(echo $BUILTINPHOPATH | cut -d '/' -f5-)"
-export PKG="$(echo $FILE | cut -d '_' -f1)"
-export VERSION="$(echo $FILE | cut -d '_' -f2)"
+output_echo "Found $BUILTINPHOPATH"
+FILE="$(echo $BUILTINPHOPATH | cut -d '/' -f5-)"
+PKG="$(echo $FILE | cut -d '_' -f1)"
+VERSION="$(echo $FILE | cut -d '_' -f2)"
 POOLPATH=""            # declared as a global variable
 set_poolpath $PKG      # so we can set it here with a function
 FTPMASTERPATH="$(echo $BUILTINPHOPATH | cut -d '/' -f2-4)"


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -824,6 +824,7 @@
                     my_description: 'Link files for buildinfos.debian.net from date to pool structure'
                     my_hname: 'profitbricks7'
                     my_timed: '10 */2 * * *'
+                    my_disabled: true
                 - 'debian_rebuilder_prototype':
                     my_description: 'Prototype rebuilder for Debian'
                     my_hname: 'profitbricks7'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e1a3282fdb623a6f766497623d2b331a749258ef...8227eec2d77158a253b7b7c57b016d9c180ba8a5

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e1a3282fdb623a6f766497623d2b331a749258ef...8227eec2d77158a253b7b7c57b016d9c180ba8a5
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/20200501/85137518/attachment-0001.html>