[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: openqa: no need to explicitly install libcpanel-json-xs-perl as #1019920 has been fixed

[Holger Levsen (@holger)]

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


Commits:
fb7815fc by Holger Levsen at 2022-10-12T12:00:09+02:00
openqa: no need to explicitly install libcpanel-json-xs-perl as #1019920 has been fixed

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

- - - - -
91577f7e by Holger Levsen at 2022-10-12T12:02:07+02:00
Revert "reproducible debian: ensure 2nd build is merged-usr"

because this might cause failures in older suites where usrmerge is not installed or available...
because this might give wrong results in older suites...

should be readded properly only for bookworm, sid and experimental

This reverts commit 1bd4336054873d1be6013bb939d2cbe1abc98ae1.

- - - - -


3 changed files:

- bin/jenkins_node_wrapper.sh
- − hosts/common/etc/pbuilder/rebuild-hooks/A99_set_merged_usr
- 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 ; 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 ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_coreboot ]] ; then
 	exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed";
 elif [[ "$*" =~ ^reproducible_openwrt ]] ; then


=====================================
hosts/common/etc/pbuilder/rebuild-hooks/A99_set_merged_usr deleted
=====================================
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# https://bugs.debian.org/1021402
-
-set -e
-
-echo "Re-configuring usrmerge..."
-
-rm -fv /etc/unsupported-skip-usrmerge-conversion
-dpkg-reconfigure usrmerge


=====================================
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'
                     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/1bd4336054873d1be6013bb939d2cbe1abc98ae1...91577f7ebc05f98b425d0d520b82606b02e8f515

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/1bd4336054873d1be6013bb939d2cbe1abc98ae1...91577f7ebc05f98b425d0d520b82606b02e8f515
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/20221012/62dd1a45/attachment-0001.htm>