[Git][qa/jenkins.debian.net][master] reproducible_debian_live_build: New clustering of jobs in openQA

[Holger Levsen (@holger)]

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


Commits:
aafcf255 by Roland Clobus at 2025-02-26T17:04:41+01:00
reproducible_debian_live_build: New clustering of jobs in openQA

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

- - - - -


1 changed file:

- bin/reproducible_debian_live_build.sh


Changes:

=====================================
bin/reproducible_debian_live_build.sh
=====================================
@@ -76,23 +76,12 @@ publish_results() {
 		# Invoke openQA
 		CHECKSUM=$(grep "Checksum:" ${RESULTSDIR}/summary_build1.txt | cut -f 2 -d " ")
 		IMAGE_TIMESTAMP=$(grep "Snapshot timestamp:" ${RESULTSDIR}/summary_build1.txt | cut -f 3 -d " ")
-		case ${DESKTOP} in
-		"smallest-build")
-			# No DESKTOP=xxx setting, LIVE_INSTALLER=no
-			OPENQA_EXTRA_OPTIONS="LIVE_INSTALLER=no"
-			;;
-		"standard")
-			# No DESKTOP=xxx setting
-			OPENQA_EXTRA_OPTIONS=""
-			;;
-		*)
-			OPENQA_EXTRA_OPTIONS="DESKTOP=${DESKTOP}"
-			;;
-		esac
+		# Keep only the day part of the timestamp. All images from the same day will be clustered in openQA
+		BUILD=$(echo ${IMAGE_TIMESTAMP} | awk '{ c=split($0, a, "_"); print substr(a[c],1, 8); }')
 		output_echo "Triggering openqa.debian.net for live-build ${IMAGE_TIMESTAMP}_${SUITE}_${DESKTOP} checksum=${CHECKSUM} now."
 		# Allow for more details when openQA fails
 		set +e
-		schroot --directory ${RESULTSDIR} -c source:jenkins-reproducible-unstable-diffoscope -- openqa-cli api -X POST isos ISO=${DESKTOP}_${SUITE}_${IMAGE_TIMESTAMP}.iso DISTRI=debian VERSION=${SUITE}_${DESKTOP} FLAVOR=live-build ARCH=x86_64 BUILD=${IMAGE_TIMESTAMP}_${SUITE}_${DESKTOP/-/_} CHECKSUM=${CHECKSUM} TIMESTAMP=${IMAGE_TIMESTAMP} ISO_URL=https://tests.reproducible-builds.org/debian/live_build/artifacts/r00t-me/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET} ${OPENQA_EXTRA_OPTIONS} | tee out.json
+		schroot --directory ${RESULTSDIR} -c source:jenkins-reproducible-unstable-diffoscope -- openqa-cli api -X POST isos ISO=${DESKTOP}_${SUITE}_${IMAGE_TIMESTAMP}.iso DISTRI=debian-live VERSION=${SUITE} FLAVOR=${DESKTOP} ARCH=x86_64 BUILD=${BUILD} CHECKSUM=${CHECKSUM} TIMESTAMP=${IMAGE_TIMESTAMP} ISO_URL=https://tests.reproducible-builds.org/debian/live_build/artifacts/r00t-me/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET} | tee out.json
 		OPENQA_RETURNVALUE=$?
 		# Turn on again
 		set -e



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/aafcf255e6a421494bf70f5bf99973f33b3466f6

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/aafcf255e6a421494bf70f5bf99973f33b3466f6
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/20250226/9e472f40/attachment-0001.htm>