[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible Debian: cleanup TODO, this is good enough as it is

[Holger Levsen]

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


Commits:
ae0b90e5 by Holger Levsen at 2019-02-08T16:56:36Z
reproducible Debian: cleanup TODO, this is good enough as it is

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

- - - - -
25c9960b by Holger Levsen at 2019-02-08T16:57:11Z
reproducible Debian: cleanup TODO, worker.log's are linked from https://tests.reproducible-builds.org/debian/index_nodes_health.html

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

- - - - -
cd3a475d by Holger Levsen at 2019-02-08T17:04:02Z
reproducible Fedora: only update mock on build nodes

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

- - - - -


2 changed files:

- bin/reproducible_build_rpm.sh
- bin/reproducible_build_service.sh


Changes:

=====================================
bin/reproducible_build_rpm.sh
=====================================
@@ -31,9 +31,12 @@ update_mock() {
 	local STAMP="${RPM_STAMPS}-$RELEASE-$ARCH"
 	touch -d "$(date -u -d "6 hours ago" '+%Y-%m-%d %H:%M') UTC" $DUMMY
 	if [ ! -f $STAMP ] || [ $DUMMY -nt $STAMP ] ; then
-		echo "$(date -u ) - updating mock for $RELEASE ($ARCH) on $HOSTNAME now..."
-		mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. --cleanup-after -v --update 2>&1
-		echo "$(date -u ) - mock updated."
+		if [ "$MODE" != "master" ] ; then
+			# mock is only used on the build node
+			echo "$(date -u ) - updating mock for $RELEASE ($ARCH) on $HOSTNAME now..."
+			mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. --cleanup-after -v --update 2>&1
+			echo "$(date -u ) - mock updated."
+		fi
 		case $RELEASE in
 			fedora-23) RELVER=23 ;;
 			*)         echo "Unsupported release $RELEASE, please fix this script." ; exit 1 ;;
@@ -222,7 +225,7 @@ ARCH="$2"
 UNIQUEEXT="mock${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}"
 SRCPACKAGE=""	# package name
 SRC_RPM=""	# src rpm file name
-#update_mock # FIXME: we dont have to run mock on the main node yet, but we will need at least have to update yum there…
+update_mock
 choose_package
 # build package twice
 mkdir b1 b2


=====================================
bin/reproducible_build_service.sh
=====================================
@@ -246,11 +246,6 @@ while true ; do
 done
 
 # FIXME: TODO left for _service.sh:
-# * logs should auto display in browser like with jenkins…
-#   - mostly done, except one needs to manually scroll down… (could probably be fixed with javascript…)
-# * there's also https://jenkins.debian.net/userContent/reproducible/debian/build_service/amd64_1/worker.log (for all the workers…)
-#   - no automatic reload for that yet, though. and not linked anywhere
-#   - probably together with build nodes graphs?
 # * enabling the service in update_jdn
 # * maintenance job might want to:
 #   - check for running builds using systemctl show & ps fax



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/ebbb8dceeae8a3ce1d973a872deca3cd73ca31b0...cd3a475df36e47ed567c9baf5989e30494e6f026

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/ebbb8dceeae8a3ce1d973a872deca3cd73ca31b0...cd3a475df36e47ed567c9baf5989e30494e6f026
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/20190208/04934b50/attachment-0001.html>