[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: reproducible Debian: add notes about #1019920

[Holger Levsen (@holger)]

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


Commits:
46fbe226 by Holger Levsen at 2022-09-16T12:07:48+02:00
reproducible Debian: add notes about #1019920

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

- - - - -
5c9a051e by Roland Clobus at 2022-09-16T12:08:34+02:00
reproducible Debian live: Fixes the work directory for openqa-cli

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

- - - - -
bb641831 by Roland Clobus at 2022-09-16T12:08:56+02:00
reproducible Debian live: Remove previously published files

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

- - - - -
867fd566 by Holger Levsen at 2022-09-16T12:11:58+02:00
reproducible: add notes about infrastrcuture usage

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

- - - - -


4 changed files:

- README.infrastructure
- bin/jenkins_node_wrapper.sh
- bin/reproducible_debian_live_build.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
README.infrastructure
=====================================
@@ -46,6 +46,7 @@ support at osuosl.org mentioning the machine name in the subject.
 The nodes are used for these jobs:
 
 * osuosl167: debian-janitor, mmdebstrap-jenkins jobs and openqa.d.n workers
+** janitor and openqa worker should be split on different nodes
 * osuosl168: UNUSED
 * osuosl170: archlinux (future), alpine
 * osuosl171: openwrt, coreboot, netbsd
@@ -53,6 +54,7 @@ The nodes are used for these jobs:
 * osuosl172: openwrt, coreboot (future)
 * osuosl173: Debian live-builds / bootstrap jobs
 * osuosl174: bwiedemann: opensuse tests, vagrant: ocasional manual tests
+** could use much less ressources
 * osuosl184: archlinux, alpine
 
 Please note that the machines are called gccXXX at osuosl.org, though usually


=====================================
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";
+	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_debian_live_build.sh
=====================================
@@ -34,6 +34,14 @@ cleanup() {
 	local RESULT=$1
 	output_echo "Publishing results."
 
+	# Remove previously published files
+	# Ignore the error code, because the file might not be present
+	set +e
+	publish_file delete ISOfile ${DESKTOP}-${SUITE}.iso
+	publish_file delete Summary ${DESKTOP}-${SUITE}.txt
+	publish_file delete DiffoscopeOutput ${DESKTOP}-${SUITE}.html
+	set -e
+
 	if [ "${RESULT}" == "success" ]; then
 		output_echo "Info: no differences found."
 
@@ -43,7 +51,7 @@ cleanup() {
 		publish_file Summary ${RESULTSDIR}/summary_build1.txt ${DESKTOP}-${SUITE}.txt
 
 		# Invoke openQA
-		OPEN_QA_CLI="schroot --directory $TMPDIR -c source:jenkins-reproducible-unstable-diffoscope -- openqa-cli"
+		OPEN_QA_CLI="schroot --directory ${RESULTSDIR} -c source:jenkins-reproducible-unstable-diffoscope -- openqa-cli"
 		CHECKSUM=$(grep "Checksum:" ${RESULTSDIR}/summary_build1.txt | cut -f 2 -d " ")
 		output_echo "Triggering openqa.debian.net for live-build ${SNAPSHOT_TIMESTAMP}_${SUITE}_${DESKTOP} checksum=${CHECKSUM} now."
 		case ${DESKTOP} in


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -514,7 +514,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'
+                    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/037654da08a78e3d04a0254f34dca991a8e9b413...867fd5665f4eb641e4228670af1251385097cf12

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/037654da08a78e3d04a0254f34dca991a8e9b413...867fd5665f4eb641e4228670af1251385097cf12
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/20220916/90f562ec/attachment-0001.htm>