[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible OpenWrt: fix typo in previous commit

[Holger Levsen (@holger)]

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


Commits:
6a3a5548 by Holger Levsen at 2022-02-10T02:09:58+01:00
reproducible OpenWrt: fix typo in previous commit

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

- - - - -
2a2b9854 by Holger Levsen at 2022-02-10T02:12:51+01:00
reproducible OpenWrt: make non-debug mode a bit less verbose

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

- - - - -
786af187 by Holger Levsen at 2022-02-10T02:14:19+01:00
reproducible OpenWrt: enable debug mode

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

- - - - -


1 changed file:

- bin/reproducible_openwrt.sh


Changes:

=====================================
bin/reproducible_openwrt.sh
=====================================
@@ -10,7 +10,7 @@
 # reproducible_lede_common.sh and reproducible_lede.sh
 # (which in turn was based on another variant of reproducible_openwrt.sh)
 
-DEBUG=false
+DEBUG=true
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
@@ -120,7 +120,7 @@ node_document_environment() {
 	done
 	echo "</table>" >> "$toolchain_html"
 	echo "<table><tr><th>Debian $(cat /etc/debian_version) $(dpkg --print-architecture) package name</th><th>installed version</th></tr>" >> "$toolchain_html"
-	for i in OPENWRT_HOST_PACKAGES ; do
+	for i in $OPENWRT_HOST_PACKAGES ; do
 		echo " <tr><td>$i</td><td>" >> "$toolchain_html"
 		dpkg -s $i|grep '^Version'|cut -d " " -f2 >> "$toolchain_html"
 		echo " </td></tr>" >> "$toolchain_html"
@@ -433,12 +433,14 @@ build_two_times() {
 	# download and prepare openwrt on node b1
 	$SSHN1 "reproducible_openwrt" node openwrt_download "$TARGET" "$CONFIG" "$TMPBUILDDIR"
 
-	echo "== master"
-	ls -la "$TMPBUILDDIR/download/" || true
-	echo "== node1"
-	$SSHN1 "reproducible_openwrt" node node_debug "$TMPBUILDDIR"
-	echo "== node2"
-	$SSHN2 "reproducible_openwrt" node node_debug "$TMPBUILDDIR"
+	if $DEBUG ; then
+		echo "== master"
+		ls -la "$TMPBUILDDIR/download/" || true
+		echo "== node1"
+		$SSHN1 "reproducible_openwrt" node node_debug "$TMPBUILDDIR"
+		echo "== node2"
+		$SSHN2 "reproducible_openwrt" node node_debug "$TMPBUILDDIR"
+	fi
 
 	rsync -a "$GENERIC_NODE1:$TMPBUILDDIR/download/" "$TMPBUILDDIR/download/"
 	rsync -a "$TMPBUILDDIR/download/" "$GENERIC_NODE2:$TMPBUILDDIR/download/"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/24642e74f96c58db86f3aefaf8796b81a1a87d4f...786af187da64a48e5cd7d95bafdcc6b29026d9a1

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/24642e74f96c58db86f3aefaf8796b81a1a87d4f...786af187da64a48e5cd7d95bafdcc6b29026d9a1
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/20220210/09124eae/attachment-0001.htm>