[Git][qa/jenkins.debian.net][master] reproducible_debian_live_build: Treat openQA issues as warning

[Holger Levsen (@holger)]

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


Commits:
c0f0465f by Roland Clobus at 2024-08-17T23:48:26+09:00
reproducible_debian_live_build: Treat openQA issues as warning

* If openQA is down, a 503 HTTP-response is sent
* If the host running openQA is down: 'No route to host'
* On syntax errors, a 404 HTTP-response is sent

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

- - - - -


2 changed files:

- bin/reproducible_debian_live_build.sh
- logparse/reproducible.rules


Changes:

=====================================
bin/reproducible_debian_live_build.sh
=====================================
@@ -90,9 +90,19 @@ publish_results() {
 			;;
 		esac
 		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
-		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) }'
+		OPENQA_RETURNVALUE=$?
+		# Turn on again
+		set -e
+		if [ ${OPENQA_RETURNVALUE} -ne 0 ]; then
+			awk '/<title>[0-9]+/ { print "Warning: openQA HTTP-response is " substr($0, 8)+0 } ' out.json
+			echo "Warning: openQA returned error code ${OPENQA_RETURNVALUE}"
+		else
+			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) }'
+		fi
 		rm out.json
 	else
 		if [ -f "${RESULTSDIR}/${PROJECTNAME}/${DESKTOP}/live-image-amd64.hybrid.iso.html" ]; then


=====================================
logparse/reproducible.rules
=====================================
@@ -64,4 +64,6 @@ info /Info: using live-build from git/
 info /Info: using the snapshot from/
 info /Info: no differences found/
 info /Reproducible hook has been applied/
-
+# Issues with openQA
+warning /Warning: openQA HTTP-response/
+warning /Warning: openQA returned error code/



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c0f0465fb601e01939879e655dff6b6939dd8ade
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/20240817/e2fd13e9/attachment-0001.htm>