[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible_debian_live_build: Use the actual timestamp for openQA

[Holger Levsen (@holger)]

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


Commits:
f0ac16d1 by Roland Clobus at 2023-03-29T23:19:30+02:00
reproducible_debian_live_build: Use the actual timestamp for 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
=====================================
@@ -74,22 +74,23 @@ publish_results() {
 		publish_file publish Summary ${RESULTSDIR}/summary_build1.txt ${DESKTOP}-${SUITE}-summary.txt
 
 		# Invoke openQA
-		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."
+		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
-			$OPEN_QA_CLI api -X POST isos ISO=${DESKTOP}_${SUITE}_${SNAPSHOT_TIMESTAMP}.iso DISTRI=debian VERSION=${SUITE}_${DESKTOP} FLAVOR=live-build ARCH=x86_64 BUILD=:${SNAPSHOT_TIMESTAMP}_${SUITE}_${DESKTOP} CHECKSUM=${CHECKSUM} TIMESTAMP=${SNAPSHOT_TIMESTAMP} ISO_URL=https://tests.reproducible-builds.org/debian_live_build/artifacts/r00t-me/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET} LIVE_INSTALLER=no | tee out.json
+			OPENQA_EXTRA_OPTIONS="LIVE_INSTALLER=no"
 			;;
 		"standard")
 			# No DESKTOP=xxx setting
-			$OPEN_QA_CLI api -X POST isos ISO=${DESKTOP}_${SUITE}_${SNAPSHOT_TIMESTAMP}.iso DISTRI=debian VERSION=${SUITE}_${DESKTOP} FLAVOR=live-build ARCH=x86_64 BUILD=:${SNAPSHOT_TIMESTAMP}_${SUITE}_${DESKTOP} CHECKSUM=${CHECKSUM} TIMESTAMP=${SNAPSHOT_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_EXTRA_OPTIONS=""
 			;;
 		*)
-			$OPEN_QA_CLI api -X POST isos ISO=${DESKTOP}_${SUITE}_${SNAPSHOT_TIMESTAMP}.iso DISTRI=debian VERSION=${SUITE}_${DESKTOP} FLAVOR=live-build ARCH=x86_64 BUILD=:${SNAPSHOT_TIMESTAMP}_${SUITE}_${DESKTOP} CHECKSUM=${CHECKSUM} TIMESTAMP=${SNAPSHOT_TIMESTAMP} ISO_URL=https://tests.reproducible-builds.org/debian_live_build/artifacts/r00t-me/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET} DESKTOP=${DESKTOP} | tee out.json
+			OPENQA_EXTRA_OPTIONS="DESKTOP=${DESKTOP}"
 			;;
 		esac
+		output_echo "Triggering openqa.debian.net for live-build ${IMAGE_TIMESTAMP}_${SUITE}_${DESKTOP} checksum=${CHECKSUM} now."
+		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
 		jq .ids out.json | awk '$1 + 0 > 0 { print "- enjoy https://openqa.debian.net/tests/" ($1 + 0) }'
 		jq .scheduled_product_id out.json  | awk '$1 + 0 > 0 { print "- enjoy https://openqa.debian.net/admin/productlog?id=" ($1 + 0) }'
 		rm out.json



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/f0ac16d1310d6d555de007b36079b9c8f37db63a
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/20230329/3f12884a/attachment-0001.htm>