Commit 1bdb6b3f authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Debian: fixup 8cf7c66f and keep global variables global 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 8cf7c66f

bin/reproducible_worker.sh

+17 −14
Original line number Diff line number Diff line
@@ -31,14 +31,6 @@ notify_log_of_failure() { 
}



main_loop() {

	#

	# check if we really should be running

	#

	RUNNING=$(ps fax|grep -v grep|grep "$0 $1 ")

	if [ -z "$RUNNING" ] ; then

		echo "$(date --utc) - '$0 $1' already running, thus stopping this."

		break

	fi

	SERVICE="reproducible_build@startup.service"

	# try systemctl twice, but only output and thus log the 2nd attempt…

	RUNNING=$(systemctl show $SERVICE 2>/dev/null |grep ^SubState|cut -d "=" -f2)
@@ -48,14 +40,10 @@ main_loop() { 
		RUNNING=$(systemctl show $SERVICE|grep ^SubState|cut -d "=" -f2)

		if [ "$RUNNING" != "running" ] ; then

			echo "$(date --utc) - '$SERVICE' not running, thus stopping this."

			break

			sleep 60.1337m

			exit

		fi

	fi

	LOCKFILE="/var/lib/jenkins/NO-RB-BUILDERS-PLEASE"

	if [ -f "$LOCKFILE" ]; then

		echo "The lockfile $LOCKFILE is present, thus stopping this"

		break

	fi

	if [ -f "$JENKINS_OFFLINE_LIST" ]; then

		for n in "$NODE1" "$NODE2"; do

			if grep -q "$n" "$JENKINS_OFFLINE_LIST"; then
@@ -104,7 +92,22 @@ main_loop() { 
	[ "$RETCODE" -eq 0 ] || notify_log_of_failure

}



#

# check if we really should be running

#

RUNNING=$(ps fax|grep -v grep|grep "$0 $1 ")

if [ -z "$RUNNING" ] ; then

	echo "$(date --utc) - '$0 $1' already running, thus stopping this."

	exit

fi

LOCKFILE="/var/lib/jenkins/NO-RB-BUILDERS-PLEASE"

if [ -f "$LOCKFILE" ]; then

	echo "The lockfile $LOCKFILE is present, thus stopping this"

	exit

fi

#

# main

#

while true ; do

	main_loop

done