[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible OpenWrt/coreboot: directly install coreboot-utils (for cbfstools)...

[Holger Levsen (@holger)]

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


Commits:
7d4eecf0 by Holger Levsen at 2022-09-24T13:48:19+02:00
reproducible OpenWrt/coreboot: directly install coreboot-utils (for cbfstools) until #1020630 is fixed

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

- - - - -


3 changed files:

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


Changes:

=====================================
TODO
=====================================
@@ -120,12 +120,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 
 === tests.reproducible-builds.org
 
-==== General website
-
-* install cbfstool in diffoscope schroots: (useful for openwrt+coreboot)
-** 'git clone --recursive http://review.coreboot.org/p/coreboot.git ; cd coreboot/util/cbfstool ; make ; cp cbfstool $TARGET/usr/local/bin/'
-** there's also an ITP (and sponsor request) for src:coreboot which has cbfstool in a coreboot-utils package
-
 === Debian reproducible builds
 
 * get rid off "set -x # # to debug diffoscoppe/schroot problems"


=====================================
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; croak "Exec failed"; # once #1019920 has been fixed libcpanel-json-xs-perl can be removed here
+	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
 elif [[ "$*" =~ ^reproducible_coreboot ]] ; then
 	exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_openwrt ]] ; then


=====================================
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' # once #1019920 has been fixed libcpanel-json-xs-perl can be removed here
+                    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_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/-/commit/7d4eecf06a89bae2e5445511d20aa17fed879795

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/7d4eecf06a89bae2e5445511d20aa17fed879795
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/20220924/269d2a10/attachment-0001.htm>