[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: janitor: Drop comments that break command-line

[Holger Levsen (@holger)]

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


Commits:
02689ec9 by Jelmer Vernooij at 2023-04-17T00:51:39+02:00
janitor: Drop comments that break command-line

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

- - - - -
81f7dc2f by Roland Clobus at 2023-04-17T00:52:02+02:00
reproducible_debian_live_build: Use different naming for builds

The BUILD parameter should only use minus, dot, at, \d and \w.
The tag parser expects only this small set of allowed characters.

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

- - - - -


2 changed files:

- bin/janitor_worker.sh
- bin/reproducible_debian_live_build.sh


Changes:

=====================================
bin/janitor_worker.sh
=====================================
@@ -7,9 +7,6 @@ docker run --rm --privileged \
 	-v /srv/janitor:/srv/janitor \
 	-e BUILD_URL="${BUILD_URL}" \
 	-e NODE_NAME="${NODE_NAME}" \
-	# Reduce priority for CPU when the system is under load; default is 1024.
-	# 1024 / 2 / 6 = 8% CPU for each worker (6 workers) when the system is
-	# under load.
 	--cpu-shares 86 \
 	--tmpfs /tmp:rw,exec,dev,suid \
 	--tmpfs /var/lib/schroot/session:rw,exec,dev,suid \


=====================================
bin/reproducible_debian_live_build.sh
=====================================
@@ -90,7 +90,7 @@ publish_results() {
 			;;
 		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
+		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/-/compare/0999c403d460f9992371d10fedd9cec9c79b71f9...81f7dc2f6769da55aa07e736fbea434fb1fd7f4c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/0999c403d460f9992371d10fedd9cec9c79b71f9...81f7dc2f6769da55aa07e736fbea434fb1fd7f4c
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/20230416/3a15e3d4/attachment-0001.htm>