[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian live: Trigger openQA with the reproducible images

[Holger Levsen (@holger)]

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


Commits:
34e9d35f by Roland Clobus at 2022-09-14T15:06:02+02:00
reproducible Debian live: Trigger openQA with the reproducible images

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

- - - - -
7086f8d3 by Holger Levsen at 2022-09-14T15:10:33+02:00
reproducible Debian live: run openqa-cli from unstable schroot

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

- - - - -


3 changed files:

- bin/reproducible_debian_live_build.sh
- + hosts/osuosl173-amd64/etc/apt/sources.list.d/philh-openqa.list
- update_jdn.sh


Changes:

=====================================
bin/reproducible_debian_live_build.sh
=====================================
@@ -43,14 +43,21 @@ cleanup() {
 		publish_file Summary ${RESULTSDIR}/summary_build1.txt ${CONFIGURATION}-${DEBIAN_VERSION}.txt
 
 		# Invoke openQA
-		DESKTOP=${CONFIGURATION}
-		if [ ${DESKTOP} == "smallest-build" ]; then
-			DESKTOP="text"
-		elif [ ${DESKTOP} == "standard" ]; then
-			DESKTOP="text"
-		fi
+		OPEN_QA_CLI="schroot --directory $TMPDIR -c source:jenkins-reproducible-unstable-diffoscope openqa-cli"
 		CHECKSUM=$(grep "Checksum:" ${RESULTSDIR}/summary_build1.txt | cut -f 2 -d " ")
-		#openqa-cli api -X POST isos ISO=${SNAPSHOT_TIMESTAMP}_${DEBIAN_VERSION}_${CONFIGURATION}.iso DISTRI=debian VERSION=${DEBIAN_VERSION}_${CONFIGURATION} FLAVOR=live-build ARCH=x86_64 BUILD=:${CONFIGURATION}_${DEBIAN_VERSION}_${SNAPSHOT_TIMESTAMP} DESKTOP=${DESKTOP} CHECKSUM=${CHECKSUM} TIMESTAMP=${SNAPSHOT_TIMESTAMP} ISO_URL=https://tests.reproducible-builds.org/debian_live_build/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET}
+		case ${DESKTOP} in
+		"smallest-build")
+			# No DESKTOP=xxx setting, LIVE_INSTALLER=no
+			$OPEN_QA_CLI api -X POST isos ISO=${DESKTOP}_${SUITE}_${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/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET} LIVE_INSTALLER=no
+			;;
+		"standard")
+			# No DESKTOP=xxx setting
+			$OPEN_QA_CLI api -X POST isos ISO=${DESKTOP}_${SUITE}_${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/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET}
+			;;
+		*)
+			$OPEN_QA_CLI api -X POST isos ISO=${DESKTOP}_${SUITE}_${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/${ISONAME} --odn --apikey ${OPENQA_APIKEY} --apisecret ${OPENQA_APISECRET} DESKTOP=${DESKTOP}
+			;;
+		esac
 	else
 		if [ -f "${RESULTSDIR}/${PROJECTNAME}/${CONFIGURATION}/live-image-amd64.hybrid.iso.html" ]; then
 			# Publish the output of diffoscope, there are differences


=====================================
hosts/osuosl173-amd64/etc/apt/sources.list.d/philh-openqa.list
=====================================
@@ -0,0 +1,2 @@
+# This is Phil Hands's repo, where he uploads OpenQA packages that are not yet fit for Debian
+deb [signed-by=/usr/share/keyrings/hands-deb-keyring.gpg] http://ftp.hands.com/hands-deb/ bullseye main


=====================================
update_jdn.sh
=====================================
@@ -382,6 +382,9 @@ if [ -f /etc/debian_version ] ; then
 			# needed for rebuilding Debian (using .buildinfo files)
 			osuosl173-amd64) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild" 
 					 DEBS="$DEBS live-build"	# needed for live-build
+					 # OpenQA client, needed for live-build -- currently installed with help from:
+					 #   hosts/osuosl173-amd64/etc/apt/sources.list.d/philh-openqa.list
+					 DEBS="$DEBS openqa-client"
 					 DEBS="$DEBS cdebootstrap"  	# needed for testing just that
 					 DEBS="$DEBS distro-info" ;;	# needed for setting S_D_E to a 'good' value
 			# needed for opensuse openbuildservice



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/96bd30aa14256f6b728e49e71ba475212d9284c8...7086f8d3185a2de48d12e8a3cbb23fb3be6cdb08

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/96bd30aa14256f6b728e49e71ba475212d9284c8...7086f8d3185a2de48d12e8a3cbb23fb3be6cdb08
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/20220914/96868136/attachment-0001.htm>