[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] avoid 1-3 "apt install" calls on each deployment run

[Holger Levsen]

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


Commits:
6de8b742 by Holger Levsen at 2019-02-08T19:00:32Z
avoid 1-3 "apt install" calls on each deployment run

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

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
@@ -380,7 +380,29 @@ if [ -f /etc/debian_version ] ; then
 		if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
 			# for phil only
 			DEBS="$DEBS postfix-pcre"
+			# only needed on the main node
+		elif [ "$HOSTNAME" = "jenkins" ] ; then
+			DEBS="$DEBS ffmpeg libav-tools python3-popcon dose-extra"
+		fi
+		# mock is needed to build fedora
+		if [ "$HOSTNAME" = "osuosl-build171-amd64" ] || [ "$HOSTNAME" = "osuosl-build172-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
+			DEBS="$DEBS mock"
 		fi
+		# for varying kernels:
+		# - we use bpo kernels on pb-build5+15 (and the default amd64 kernel on pb-build6+16-i386)
+		# - we also use the bpo kernel on osuosl-build172 (but not osuosl-build171)
+		if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build15-amd64" ] \
+			|| [ "$HOSTNAME" = "osuosl-build172-amd64" ] ; then
+			DEBS="$DEBS linux-image-amd64/stretch-backports"
+		elif [ "$HOSTNAME" = "profitbricks-build6-i386" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] \
+			|| [ "$HOSTNAME" = "profitbricks-build2-i386" ] || [ "$HOSTNAME" = "profitbricks-build12-i386" ] ; then
+			# we dont vary the kernel on i386 atm, see #875990 + #876035
+			DEBS="$DEBS linux-image-amd64:amd64"
+		elif [ "$HOSTNAME" = "osuosl-build169-amd64" ] || [ "$HOSTNAME" = "osuosl-build170-amd64" ] ; then
+			# Arch Linux builds latest stuff which sometimes (eg, currentlt Qt) needs newer kernel to build...
+			DEBS="$DEBS linux-image-amd64/stretch-backports"
+		fi
+		# only on main node
 		if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
 			MASTERDEBS=" 
 				apache2 
@@ -408,6 +430,7 @@ if [ -f /etc/debian_version ] ; then
 				imagemagick 
 				ip2host
 				jekyll
+				jenkins-job-builder/stretch-backports
 				kgb-client
 				libcap2-bin 
 				libfile-touch-perl 
@@ -481,30 +504,6 @@ if [ -f /etc/debian_version ] ; then
 		if [ "$(dpkg-query -W -f='${db:Status-Abbrev}\n' unattended-upgrades 2>/dev/null || true)" = "ii "  ] ; then
 			 sudo apt-get -y purge unattended-upgrades
 		fi
-		# we need mock to build fedora
-		if [ "$HOSTNAME" = "osuosl-build171-amd64" ] || [ "$HOSTNAME" = "osuosl-build172-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
-			$UP2DATE || sudo apt-get install mock
-		fi
-		# for varying kernels:
-		# - we use bpo kernels on pb-build5+15 (and the default amd64 kernel on pb-build6+16-i386)
-		# - we also use the bpo kernel on osuosl-build172 (but not osuosl-build171)
-		if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build15-amd64" ] \
-			|| [ "$HOSTNAME" = "osuosl-build172-amd64" ] ; then
-			$UP2DATE || sudo apt-get install -t stretch-backports linux-image-amd64
-		elif [ "$HOSTNAME" = "profitbricks-build6-i386" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] \
-			|| [ "$HOSTNAME" = "profitbricks-build2-i386" ] || [ "$HOSTNAME" = "profitbricks-build12-i386" ] ; then
-			# we dont vary the kernel on i386 atm, see #875990 + #876035
-			$UP2DATE || sudo apt-get install linux-image-amd64:amd64
-		elif [ "$HOSTNAME" = "osuosl-build169-amd64" ] || [ "$HOSTNAME" = "osuosl-build170-amd64" ] ; then
-			# Arch Linux builds latest stuff which sometimes (eg, currentlt Qt) needs newer kernel to build...
-			$UP2DATE || sudo apt-get install -t stretch-backports linux-image-amd64
-		fi
-		# only needed on the main nodes
-		if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
-			$UP2DATE || sudo apt-get install jenkins-job-builder/stretch-backports
-		elif [ "$HOSTNAME" = "jenkins" ] ; then
-			$UP2DATE || sudo apt-get install ffmpeg libav-tools python3-popcon jenkins-job-builder/stretch-backports dose-extra
-		fi
 		sudo apt-get clean
 		explain "packages installed."
 	else



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/6de8b742e38283bec6e1d27d3506aa2f534cd69a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/6de8b742e38283bec6e1d27d3506aa2f534cd69a
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/c7850f9b/attachment-0001.html>