[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible NetBSD: Use separate release directory, ignore errors for now, centralize Noise

[Holger Levsen (@holger)]

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


Commits:
50e59e2d by Jan-Benedict Glaw at 2023-06-17T16:54:21+02:00
reproducible NetBSD: Use separate release directory, ignore errors for now, centralize Noise

Lets introduce a separate build directory, given by name. For one, that's
another build variable and this also decouples sources from the final results.

Signed-off-by: Jan-Benedict Glaw <jbglaw at lug-owl.de>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_netbsd.sh


Changes:

=====================================
bin/reproducible_netbsd.sh
=====================================
@@ -18,6 +18,11 @@ set -e
 declare -a machines	# Contains <arch>-<machine> pairs.
 machines=( sparc64-sparc64 x86_64-amd64 )
 
+# How much Noise shall NetBSD's build process generate?
+declare -a nb_noise
+nb_noise=( -N 1 )
+
+
 
 cleanup_tmpdirs() {
 	rm -r "${TMPDIR}"
@@ -28,14 +33,17 @@ create_results_dirs() {
 	mkdir -p "${BASE}/netbsd/dbd"
 }
 
+# $1 - build ("b1", "b2", ...)
+# $2 - machine ("x86_64-amd64")
+# $3 - release dir
 save_netbsd_results() {
 	local RUN="${1}"; shift
 	local FULL_MACHINE="${1}"; shift
-	local MACHINE_ONLY="$(echo "${FULL_MACHINE}" | cut -f 2 -d -)"
+	local RELEASE_DIR="${1}"; shift
 
-	mkdir -p "$TMPDIR/$RUN/${FULL_MACHINE}"
-	cp -pr "obj/releasedir/${MACHINE_ONLY}" "$TMPDIR/$RUN/"
-	find "${TMPDIR}/${RUN}/" \( -name MD5 -o -name SHA512 \) -exec rm {} \;
+	mkdir -p "${TMPDIR}/${RUN}/${FULL_MACHINE}"
+	cp -pr "${RELEASE_DIR}" "$TMPDIR/$RUN/${FULL_MACHINE}"
+	find "${TMPDIR}/${RUN}/${FULL_MACHINE}" \( -name MD5 -o -name SHA512 \) -exec rm {} \;
 }
 
 #
@@ -79,8 +87,17 @@ pushd "${TMPBUILDDIR}"
 
 		# Build and store results.
 		pushd "${this_subdir}"
-			ionice -c 3 ./build.sh -j "${NUM_CPU}" -P -U -u -a "${this_arch}" -m "${this_mach}" -N 1 tools release
-			save_netbsd_results b1 "${MACHINE}"
+			release_dir=_release_
+			full_release_dir="$(realpath "${release_dir}")"
+			mkdir -p "${release_dir}"
+
+			ionice -c 3 ./build.sh -j "${NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" tools		|| true
+			ionice -c 3 ./build.sh -j "${NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" release	|| true
+			ionice -c 3 ./build.sh -j "${NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" iso-image	|| true
+			ionice -c 3 ./build.sh -j "${NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" install-image	|| true
+			ionice -c 3 ./build.sh -j "${NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" live-image	|| true
+
+			save_netbsd_results b1 "${MACHINE}" "${full_release_dir}"
 			echo "${MACHINE} done, first time."
 		popd
 
@@ -109,10 +126,17 @@ pushd "${TMPBUILDDIR}"
 
 		# Build and store results.
 		pushd "${this_subdir}"
-			ionice -c 3 \
-				linux64 --uname-2.6 \
-				./build.sh -j "${NEW_NUM_CPU}" -P -U -u -a "${this_arch}" -m "${this_mach}" -N 1 tools release
-			save_netbsd_results b2 "${MACHINE}"
+			release_dir=_release_
+			full_release_dir="$(realpath "${release_dir}")"
+			mkdir -p "${release_dir}"
+
+			ionice -c 3 linux64 --uname-2.6 ./build.sh -j "${NEW_NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" tools		|| true
+			ionice -c 3 linux64 --uname-2.6 ./build.sh -j "${NEW_NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" release	|| true
+			ionice -c 3 linux64 --uname-2.6 ./build.sh -j "${NEW_NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" iso-image	|| true
+			ionice -c 3 linux64 --uname-2.6 ./build.sh -j "${NEW_NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" install-image	|| true
+			ionice -c 3 linux64 --uname-2.6 ./build.sh -j "${NEW_NUM_CPU}" -R "${release_dir}" -P -U -u -a "${this_arch}" -m "${this_mach}" "${nb_noise[@]}" live-image	|| true
+
+			save_netbsd_results b2 "${MACHINE}" "${full_release_dir}"
 			echo "${MACHINE} done, second time."
 		popd
 



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/50e59e2d6cde86e0875104f862a4d829eb0d88fa
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/20230617/c44dc3f3/attachment-0001.htm>