[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: refactoring

[Holger Levsen]

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


Commits:
1c580cb8 by Holger Levsen at 2019-08-29T13:29:53Z
refactoring

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

- - - - -
f17552ad by Holger Levsen at 2019-08-29T13:32:56Z
re-add jenkins zombie and logsize checks to r-b_node_health_check job

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

- - - - -
cfdba4cb by Holger Levsen at 2019-08-29T13:34:25Z
refactoring

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

- - - - -


3 changed files:

- bin/common-functions.sh
- bin/reproducible_node_health_check.sh
- update_jdn.sh


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -218,3 +218,46 @@ publish_changes_to_userContent() {
 write_page() {
 	echo "$1" >> $PAGE
 }
+
+jenkins_zombie_check() {
+	#
+	# sometimes deleted jobs come back as zombies
+	# and we dont know why and when that happens,
+	# so just report those zombies here.
+	#
+	ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch' || true)
+	if [ ! -z "$ZOMBIES" ] ; then
+		DIRTY=true
+		figlet 'zombies!!!'
+		echo "Warning, rise of the jenkins job zombies has started again, these jobs should not exist:"
+		for z in $ZOMBIES ; do
+
+			echo $(basename $z)
+		done
+		echo
+	fi
+}
+
+jenkins_logsize_check() {
+	#
+	# /var/log/jenkins/jenkins.log sometimes grows very fast
+	# and we don't yet know why, so let's monitor this for now.
+	JENKINSLOG="$(find /var/log/jenkins -name jenkins.log -size +42G)"
+	if [ -z "JENKINSLOG" ] ; then
+		figlet 'jenkins.log size'
+		echo "Warning, jenkins.log is larger than 42G, please fix, erroring out now."
+		exit 1
+	else
+		JENKINSLOG="$(find /var/log/jenkins -name jenkins.log -size +23G)"
+		if [ -z "JENKINSLOG" ] ; then
+			DIRTY=true
+			figlet 'jenkins.log size'
+			echo "Warning, jenkins.log is larger than 23G, please do something…"
+		fi
+	fi
+}
+
+jenkins_bugs_check() {
+	jenkins_zombie_check
+	jenkins_logsize_check
+}


=====================================
bin/reproducible_node_health_check.sh
=====================================
@@ -164,6 +164,12 @@ if ! systemctl is-system-running > /dev/null; then
     DIRTY=true
 fi
 
+# checks only for the main node
+#
+if [ "$HOSTNAME" = "$MAINNODE" ] ; then
+	jenkins_bugs_check
+fi
+
 #
 # finally
 #


=====================================
update_jdn.sh
=====================================
@@ -25,6 +25,9 @@
 
 set -e
 
+# prevent failure on first run...
+[ ! -f /srv/jenkins/bin/common-functions.sh ] || . /srv/jenkins/bin/common-functions.sh
+
 BASEDIR="$(dirname "$(readlink -e $0)")"
 STAMP=/var/log/jenkins/update-jenkins.stamp
 # The $@ below means that command line args get passed on to j-j-b
@@ -789,35 +792,7 @@ explain "$(date) - finished deployment."
 # some final checks only for the jenkins
 #
 if [ "$HOSTNAME" = "jenkins" ] ; then
-	#
-	# sometimes deleted jobs come back as zombies
-	# and we dont know why and when that happens,
-	# so just report those zombies here.
-	#
-	ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch' || true)
-	if [ ! -z "$ZOMBIES" ] ; then
-		figlet 'zombies!!!'
-		echo "Warning, rise of the jenkins job zombies has started again, these jobs should not exist:"
-		for z in $ZOMBIES ; do
-
-			echo $(basename $z)
-		done
-		echo
-	fi
-	#
-	# /var/log/jenkins/jenkins.log sometimes grows very fast
-	# and we don't yet know why, so let's monitor this for now.
-	JENKINSLOG="$(find /var/log/jenkins -name jenkins.log -size +42G)"
-	if [ -z "JENKINSLOG" ] ; then
-		echo "Warning, jenkins.log is larger than 42G, please fix, erroring out now."
-		exit 1
-	else
-		JENKINSLOG="$(find /var/log/jenkins -name jenkins.log -size +23G)"
-		if [ -z "JENKINSLOG" ] ; then
-			figlet 'jenkins.log size'
-			echo "Warning, jenkins.log is larger than 23G, please do something…"
-		fi
-	fi
+	jenkins_bugs_check
 	explain "$(date) - done checking for known jenkins bugs."
 fi
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/71ca811f8e68cc8e9fc1b7dcaf6056313414f381...cfdba4cb91d2c6496395862f78f0fe6ae0ba1bd1

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/71ca811f8e68cc8e9fc1b7dcaf6056313414f381...cfdba4cb91d2c6496395862f78f0fe6ae0ba1bd1
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/20190829/5d19e8d2/attachment-0001.html>