[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible Debian: refactoring
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Aug 29 17:39:30 BST 2022
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
1ab99eb2 by Holger Levsen at 2022-08-29T18:36:07+02:00
reproducible Debian: refactoring
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
b15c9dff by Holger Levsen at 2022-08-29T18:36:13+02:00
reproducible Debian: rename script to reflect broader usage
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
c9d5e862 by Holger Levsen at 2022-08-29T18:39:19+02:00
reproducible Debian: refactoring
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
4 changed files:
- bin/jenkins_master_wrapper.sh
- bin/jenkins_node_wrapper.sh
- bin/reproducible_mmdebstrap.sh → bin/reproducible_debstrap.sh
- job-cfg/reproducible.yaml
Changes:
=====================================
bin/jenkins_master_wrapper.sh
=====================================
@@ -31,7 +31,7 @@ PARAMS=("$JOB_NAME")
# add some more params if needed,
case $JOB_NAME in
- rebootstrap_*|chroot-installation_*|haskell-package-plan|reproducible_mmdebstrap_*)
+ rebootstrap_*|chroot-installation_*|haskell-package-plan|reproducible_*debstrap_*)
PARAMS+=("$@")
;;
reproducible_debian_live_build_*)
=====================================
bin/jenkins_node_wrapper.sh
=====================================
@@ -86,8 +86,8 @@ elif [ "$1" = "reproducible_pool_buildinfos" ] ; then
exec /srv/jenkins/bin/reproducible_pool_buildinfos.sh ; croak "Exec failed";
elif [ "$1" = "reproducible_html_builtin-pho" ] ; then
exec /srv/jenkins/bin/reproducible_html_builtin-pho.sh ; croak "Exec failed";
-elif [[ "$*" =~ reproducible_mmdebstrap.* ]] ; then
- exec /srv/jenkins/bin/reproducible_mmdebstrap.sh "$2" ; croak "Exec failed";
+elif [[ "$*" =~ reproducible_.*debstrap.* ]] ; then
+ exec /srv/jenkins/bin/reproducible_debstrap.sh "$2" "$3" ; croak "Exec failed";
elif [ "$1" = "janitor-setup-worker" ] ; then
shift ; exec /srv/jenkins/bin/janitor_setup_worker.sh ; croak "Exec failed";
elif [ "$1" = "janitor-worker" ] ; then
=====================================
bin/reproducible_mmdebstrap.sh → bin/reproducible_debstrap.sh
=====================================
@@ -24,11 +24,12 @@ cleanup() {
# Init some variables
-export SUITE="$1"
+export TOOL="$1"
+export SUITE="$2"
export SOURCE_DATE_EPOCH="$(date +%s)"
output_echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
-export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t mmdebstrap-${SUITE}.XXXXXXXX)
-export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t mmdebstrap-${SUITE}.XXXXXXXX) # accessible in schroots, used to compare results
+export BUILDDIR=$(mktemp --tmpdir=/srv/workspace/ -d -t ${TOOL}-${SUITE}.XXXXXXXX)
+export RESULTSDIR=$(mktemp --tmpdir=/srv/reproducible-results -d -t ${TOOL}-${SUITE}.XXXXXXXX) # accessible in schroots, used to compare results
# Cleanup if something goes wrong
trap cleanup INT TERM EXIT
@@ -36,32 +37,32 @@ trap cleanup INT TERM EXIT
# Randomize start time
delay_start
-# Actual run mmdebstrap twice
-mkdir -p $BUILDDIR/b1/mmdebstrap
-mkdir -p $BUILDDIR/b2/mmdebstrap
-output_echo "Verbosely running mmdebstrap $SUITE for the first run."
-sudo mmdebstrap -v $SUITE > $BUILDDIR/b1/mmdebstrap/${SUITE}.tar
+# Actual run ${TOOL} twice
+mkdir -p $BUILDDIR/b1/${TOOL}
+mkdir -p $BUILDDIR/b2/${TOOL}
+output_echo "Verbosely running ${TOOL} $SUITE for the first run."
+sudo ${TOOL} -v $SUITE > $BUILDDIR/b1/${TOOL}/${SUITE}.tar
-output_echo "Running mmdebstrap $SUITE for the second run."
-sudo mmdebstrap $SUITE > $BUILDDIR/b2/mmdebstrap/${SUITE}.tar
+output_echo "Running ${TOOL} $SUITE for the second run."
+sudo ${TOOL} $SUITE > $BUILDDIR/b2/${TOOL}/${SUITE}.tar
-output_echo "Done running mmdebstrap twice."
+output_echo "Done running ${TOOL} twice."
# show sha256sum results
mv $BUILDDIR/b1 $BUILDDIR/b2 $RESULTSDIR/ 1>/dev/null
-sha256sum $RESULTSDIR/b1/mmdebstrap/${SUITE}.tar $RESULTSDIR/b2/mmdebstrap/${SUITE}.tar
+sha256sum $RESULTSDIR/b1/${TOOL}/${SUITE}.tar $RESULTSDIR/b2/${TOOL}/${SUITE}.tar
# show human readable results
-if diff $RESULTSDIR/b1/mmdebstrap/${SUITE}.tar $RESULTSDIR/b2/mmdebstrap/${SUITE}.tar ; then
- output_echo "Success: mmdebstrap of $SUITE is reproducible today."
+if diff $RESULTSDIR/b1/${TOOL}/${SUITE}.tar $RESULTSDIR/b2/${TOOL}/${SUITE}.tar ; then
+ output_echo "Success: ${TOOL} of $SUITE is reproducible today."
else
- output_echo "Warning: mmdebstrap of $SUITE is not reproducible."
+ output_echo "Warning: ${TOOL} of $SUITE is not reproducible."
# Run diffoscope on the images
output_echo "Calling diffoscope on the results."
TIMEOUT="240m"
DIFFOSCOPE="$(schroot --directory /tmp -c chroot:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
TMPDIR=${RESULTSDIR}
- call_diffoscope mmdebstrap ${SUITE}.tar
+ call_diffoscope ${TOOL} ${SUITE}.tar
fi
cleanup success
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -606,17 +606,17 @@
my_timed: '0 6 * * H/3'
- 'mmdebstrap_unstable':
my_description: 'Check mmdebstrap of unstable is reproducible.'
- my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh unstable'
+ my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap unstable'
my_timed: '0 7 * * *'
my_hname: 'osuosl173'
- 'mmdebstrap_bookworm':
my_description: 'Check mmdebstrap of bookworm is reproducible.'
- my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh bookworm'
+ my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap bookworm'
my_timed: '15 7 * * *'
my_hname: 'osuosl173'
- 'mmdebstrap_bullseye':
my_description: 'Check mmdebstrap of bullseye is reproducible.'
- my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh bullseye'
+ my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap bullseye'
my_timed: '30 7 1 * *'
my_hname: 'osuosl173'
- 'json':
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/40c48f0b3c481ee2da2a2ffe2be1d8a982efe31a...c9d5e8628ea73da6e05dad9247cb381690846319
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/40c48f0b3c481ee2da2a2ffe2be1d8a982efe31a...c9d5e8628ea73da6e05dad9247cb381690846319
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/20220829/2bc03146/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list