[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible: update to...

[Holger Levsen]

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


Commits:
26160a6f by Holger Levsen at 2019-01-18T16:17:30Z
reproducible: update to "https://salsa.debian.org/dsa-team/mirror/dsa-nagios/raw/a77068307998272a55e518046789f80ee3881270/dsa-nagios-checks/checks/dsa-check-running-kernel"

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

- - - - -
3255c746 by Holger Levsen at 2019-01-18T16:19:06Z
reproducible: add linebreaks for better readability

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

- - - - -


1 changed file:

- hosts/common/usr/local/bin/dsa-check-running-kernel


Changes:

=====================================
hosts/common/usr/local/bin/dsa-check-running-kernel
=====================================
@@ -113,11 +113,12 @@ get_avail() {
 	fi
 
 	local availvrs=$(apt-cache policy ${imagename} 2>/dev/null | grep '^  Candidate' | awk '{print $2}')
-	local kernelversion=$(apt-cache policy ${prefix}-image-${kervers} 2>/dev/null | grep '^  Installed:' | awk '{print $2}')
-
-	if [ "$availvrs" = "$kernelversion" ]; then
-		return 0
-	fi
+	local kernelversion
+	for kernelversion in $(apt-cache policy ${prefix}-image-${kervers} ${prefix}-image-${kervers}-unsigned 2>/dev/null | grep '^  Installed:' | awk '{print $2}' | grep -F -v '(none)' ); do
+		if [ "$availvrs" = "$kernelversion" ]; then
+			return 0
+		fi
+	done
 
 	echo "$kernelversion != $availvrs"
 	return 1
@@ -201,13 +202,8 @@ for on_disk in \
 			fi
 			[ -z "$on_disk_version" ] || break
 			on_disk_version="`cat "$on_disk" | $STRINGS | grep 'Linux version' | head -n1`"
-			if [ -x /usr/bin/lsb_release ] ; then
-				vendor=$(lsb_release -i -s)
-				if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
-					on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
-				fi
-			fi
 			[ -z "$on_disk_version" ] || break
+
 			echo "UNKNOWN: Failed to get a version string from image $on_disk"
 			exit $UNKNOWN
 		else



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/dce5c729d471a3016f9cfef81d755ca40b31d04e...3255c746630e5520c227265d03532b62fb81b8e6

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/dce5c729d471a3016f9cfef81d755ca40b31d04e...3255c746630e5520c227265d03532b62fb81b8e6
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/20190118/e26f5ec4/attachment-0001.html>