[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian live: document refactoring

[Holger Levsen (@holger)]

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


Commits:
b85ccba7 by Holger Levsen at 2022-09-16T22:59:02+02:00
reproducible Debian live: document refactoring

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

- - - - -
7c8a4dd3 by Holger Levsen at 2022-09-16T23:05:43+02:00
reproducible Debian live: distinguish between summary and environment

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
=====================================
@@ -31,11 +31,12 @@ cleanup() {
 	fi
 }
 
-# Copy a single file to the web server
+# Copy a single file to the web server or delete it there
 #
-# Argument 1 = description (one word)
-# Argument 2 = absolute path of a file that will be published on the web server
-# Argument 3 = filename for the published file
+# Argument 1 = action
+# Argument 2 = description (one word)
+# Argument 3 = absolute path of a file that will be published on the web server
+# Argument 4 = filename for the published file
 publish_file() {
 	local ACTION=$1
 	local DESCRIPTION=$2
@@ -52,8 +53,9 @@ publish_results() {
 
 	# Remotely remove previously published files if they don't exist locally
 	[ ! -f ${DESKTOP}-${SUITE}.iso ] || publish_file delete ISOfile ${DESKTOP}-${SUITE}.iso
-	[ ! -f ${DESKTOP}-${SUITE}.txt ] || publish_file delete Summary ${DESKTOP}-${SUITE}.txt
+	[ ! -f ${DESKTOP}-${SUITE}-summary.txt ] || publish_file delete Summary ${DESKTOP}-${SUITE}-summary.txt
 	[ ! -f ${DESKTOP}-${SUITE}.html ] || publish_file delete DiffoscopeOutput ${DESKTOP}-${SUITE}.html
+	[ ! -f ${DESKTOP}-${SUITE}-env.txt ] || publish_file delete Environment ${DESKTOP}-${SUITE}-env.txt
 
 	if [ "${RESULT}" == "success" ]; then
 		output_echo "Info: no differences found."
@@ -61,7 +63,7 @@ publish_results() {
 		# Upload the ISO file and its summary to the web server
 		ISONAME=${DESKTOP}-${SUITE}.iso
 		publish_file publish ISOfile ${RESULTSDIR}/b1/${PROJECTNAME}/${DESKTOP}/live-image-amd64.hybrid.iso ${ISONAME}
-		publish_file publish Summary ${RESULTSDIR}/summary_build1.txt ${DESKTOP}-${SUITE}.txt
+		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"
@@ -88,7 +90,7 @@ publish_results() {
 		else
 			output_echo "Error: Something went wrong."
 			printenv >environment.txt
-			publish_file publish Environment ${PWD}/environment.txt ${DESKTOP}-${SUITE}.txt
+			publish_file publish Environment ${PWD}/environment.txt ${DESKTOP}-${SUITE}-env.txt
 		fi
 	fi
 }



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/2eaf0515615f116d33bbab6cb73e61bd659c9e5f...7c8a4dd326916e8f6a61086c99ea91f8e315a315

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/2eaf0515615f116d33bbab6cb73e61bd659c9e5f...7c8a4dd326916e8f6a61086c99ea91f8e315a315
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/20220916/aa175218/attachment-0001.htm>