[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible_common: Link to the Jenkins build that created the artifacts (when possible)

[Holger Levsen (@holger)]

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


Commits:
b1aca78c by Roland Clobus at 2021-08-20T14:57:29+02:00
reproducible_common: Link to the Jenkins build that created the artifacts (when possible)

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

- - - - -
5db460ec by Roland Clobus at 2021-08-20T14:57:34+02:00
reproducible_debian_live_build: Stop using an ssh-indirection, run directly on the node

The artifacts can now contain a link to the job that generate them

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

- - - - -


3 changed files:

- bin/jenkins_master_wrapper.sh
- bin/reproducible_common.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/jenkins_master_wrapper.sh
=====================================
@@ -28,7 +28,7 @@ RETRIEVE_ARTIFACTS=no
 # add some more params if needed,
 # by default we just use the job name as param
 case $JOB_NAME in
-	rebootstrap_*|chroot-installation_*|haskell-package-plan|reproducible_debian_live_build_*)
+	rebootstrap_*|chroot-installation_*|haskell-package-plan)
 			PARAMS="$JOB_NAME $@"
 			;;
 	*)		PARAMS="$JOB_NAME"


=====================================
bin/reproducible_common.sh
=====================================
@@ -607,6 +607,9 @@ write_variation_table() {
 # Variables from reproducible_common:
 #   REPRODUCIBLE_URL
 #   BASE
+# Variables from Jenkins:
+#   BUILD_URL
+#   BUILD_TAG
 save_artifacts() {
 	local TOP_LEVEL=$1
 	local BASE_FOLDER_NAME=$2
@@ -624,6 +627,9 @@ save_artifacts() {
 	echo "<p>" > $HEADER
 	printf "$msg" | sed 's#$#<br />#g' >> $HEADER
 	echo "<a href=\"$MOREINFO_URL\">More information</a><br />" >> $HEADER
+	if [ ! -z ${BUILD_URL} ] ; then
+		echo "These artifacts were created by <a href=\"${BUILD_URL}\">${BUILD_TAG}</a>br />" >> $HEADER
+	fi
 	echo "</p>" >> $HEADER
 	chmod 644 $HEADER
 }


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -981,6 +981,6 @@
             my_description: 'Build Debian {imagetype} live image for {debian_version} using live-build'
             my_timed: '55 11 * * 0'
             my_hname: 'osuosl173'
-            my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh {imagetype} {debian_version}'
+            my_shell: '/srv/jenkins/bin/reproducible_debian_live_build.sh {imagetype} {debian_version}'
             my_trigger: 'reproducible_html_rsync_remote_results'
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/0a062f280ecc26402be1522d4f0071b7d15de5e7...5db460ec12b0c03bf5a0d317cf428047f3f03f71

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/0a062f280ecc26402be1522d4f0071b7d15de5e7...5db460ec12b0c03bf5a0d317cf428047f3f03f71
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/20210820/920f286c/attachment-0001.htm>