[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible OpenWrt/coreboot: drop workaround for fixed deb#1020630

[Holger Levsen (@holger)]

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


Commits:
b048e50b by Holger Levsen at 2022-10-04T12:53:34+02:00
reproducible OpenWrt/coreboot: drop workaround for fixed deb#1020630

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

- - - - -
470e8e8d by Holger Levsen at 2022-10-04T12:55:15+02:00
reproducible Arch Linux: switch from sha1 to sha256

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

- - - - -


3 changed files:

- bin/jenkins_node_wrapper.sh
- bin/reproducible_setup_archlinux_schroot.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/jenkins_node_wrapper.sh
=====================================
@@ -163,7 +163,7 @@ elif [[ "$*" =~ ^reproducible_setup_schroot_bullseye_diffoscope_.*_.* ]] ; then
 elif [[ "$*" =~ ^reproducible_setup_schroot_bookworm_diffoscope_.*_.* ]] ; then
 	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-bookworm-diffoscope bookworm diffoscope locales-all ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_setup_schroot_unstable_diffoscope_.*_.* ]] ; then
-	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all openqa-client libcpanel-json-xs-perl coreboot-utils; croak "Exec failed"; # once #1019920 has been fixed libcpanel-json-xs-perl can be removed here / same for #1020630 and coreboot-utils
+	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all openqa-client libcpanel-json-xs-perl ; croak "Exec failed"; # once #1019920 has been fixed libcpanel-json-xs-perl can be removed here
 elif [[ "$*" =~ ^reproducible_coreboot ]] ; then
 	exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_openwrt ]] ; then


=====================================
bin/reproducible_setup_archlinux_schroot.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015-2019 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2022 Holger Levsen <holger at layer-acht.org>
 #                2017 kpcyrd <git at rxv.cc>
 #                2017 Mattia Rizzolo <mattia at debian.org>
 #                Juliana Oliveira Rodrigues <juliana.orod at gmail.com>
@@ -26,11 +26,11 @@ ARCHLINUX_MIRROR=http://mirror.one.com/archlinux/
 bootstrap() {
 	# define URL for bootstrap.tgz
 	BOOTSTRAP_BASE="$ARCHLINUX_MIRROR/iso/"
-	echo "$(date -u) - downloading Arch Linux latest/sha1sums.txt"
-	BOOTSTRAP_DATE=$(curl -sSf $BOOTSTRAP_BASE/latest/sha1sums.txt | grep x86_64.tar.gz | cut -d " " -f3 | cut -d "-" -f3 | egrep -o '[0-9.]{10}')
+	echo "$(date -u) - downloading Arch Linux latest/sha256sums.txt"
+	BOOTSTRAP_DATE=$(curl -sSf $BOOTSTRAP_BASE/latest/sha256sums.txt | grep x86_64.tar.gz | cut -d " " -f3 | cut -d "-" -f3 | egrep -o '[0-9.]{10}')
 	if [ -z $BOOTSTRAP_DATE ] ; then
 		echo "Cannot determine version of bootstrap file, aborting."
-		curl -sSf "$BOOTSTRAP_BASE/latest/sha1sums.txt" | grep x86_64.tar.gz
+		curl -sSf "$BOOTSTRAP_BASE/latest/sha256sums.txt" | grep x86_64.tar.gz
 		exit 1
 	fi
 


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -509,7 +509,7 @@
                 - 'unstable_diffoscope':
                     my_description: 'Setup schroot for running diffoscope in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)'
                     my_timed: '42 0 H/2 * *'
-                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all openqa-client libcpanel-json-xs-perl coreboot-utils' # once #1019920 has been fixed libcpanel-json-xs-perl can be removed here / same for #1020630 and coreboot-utils
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all openqa-client libcpanel-json-xs-perl' # once #1019920 has been fixed libcpanel-json-xs-perl can be removed here
                     my_disabled: false
             my_description: 'Setup {my_distro} schroot for fetching source packages for the builder jobs.'
             my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro}'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/3b1f7111cf64ce5904bbd4882737e4d982f049d5...470e8e8d67b252af94eb9db141d029847de549a8

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/3b1f7111cf64ce5904bbd4882737e4d982f049d5...470e8e8d67b252af94eb9db141d029847de549a8
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/20221004/85ce13cd/attachment-0001.htm>