[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: deploy_jdn: support iX as shortname for ionos nodes only

[Holger Levsen]

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


Commits:
27374dcc by Holger Levsen at 2021-02-28T22:45:16+01:00
deploy_jdn: support iX as shortname for ionos nodes only

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

- - - - -
8fdfbdf3 by Holger Levsen at 2021-02-28T23:01:20+01:00
builtin-pho: update list of packages for bullseye

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

- - - - -
b108293d by Holger Levsen at 2021-02-28T23:07:14+01:00
update_jdn: whitespace and comments

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

- - - - -


2 changed files:

- deploy_jdn
- update_jdn.sh


Changes:

=====================================
deploy_jdn
=====================================
@@ -30,7 +30,7 @@
 # ./deploy_jdn only ionos10	- deploy on ionos10
 # ./deploy_jdn only o167	- deploy on osuosl167
 # ./deploy_jdn only c9		- deploy on codethink9
-# ./deploy_jdn only 10		- deploy on ionos10
+# ./deploy_jdn only i10		- deploy on ionos10
 # ./deploy_jdn only 5 6		- deploy on ionos5 and ionos6
 # ./deploy_jdn only amd64	- deploy on all amd64 only
 # ./deploy_jdn upgrade|u	- run "apt-get update && upgrade && clean" everywhere
@@ -116,18 +116,18 @@ elif [ "$1" = "jenkins" ] || [ "$1" = "only" ] ; then
 	shift
 	for i in "$@" ; do
 		case "$i" in
-			1|pb1|ionos1)	HOSTS+=(ionos1-amd64.debian.net) ;;
-			2|pb2|ionos2)	HOSTS+=(ionos2-i386.debian.net) ;;
-			3|pb3|ionos3)	HOSTS+=(ionos3-i386.debian.net) ;;
-			5|pb5|ionos5)	HOSTS+=(ionos5-amd64.debian.net) ;;
-			6|pb6|ionos6)	HOSTS+=(ionos6-i386.debian.net) ;;
-			7|pb7|ionos7)	HOSTS+=(ionos7-amd64.debian.net) ;;
-			9|pb9|ionos9)	HOSTS+=(ionos9-amd64.debian.net) ;;
-			10|pb10|ionos10)	HOSTS+=(ionos10-amd64.debian.net) ;;
-			11|pb11|ionos11)	HOSTS+=(ionos11-amd64.debian.net) ;;
-			12|pb12|ionos12)	HOSTS+=(ionos12-i386.debian.net) ;;
-			15|pb15|ionos15)	HOSTS+=(ionos15-amd64.debian.net) ;;
-			16|pb16|ionos16)	HOSTS+=(ionos16-i386.debian.net) ;;
+			1|i1|ionos1)	HOSTS+=(ionos1-amd64.debian.net) ;;
+			2|i2|ionos2)	HOSTS+=(ionos2-i386.debian.net) ;;
+			3|i3|ionos3)	HOSTS+=(ionos3-i386.debian.net) ;;
+			5|i5|ionos5)	HOSTS+=(ionos5-amd64.debian.net) ;;
+			6|i6|ionos6)	HOSTS+=(ionos6-i386.debian.net) ;;
+			7|i7|ionos7)	HOSTS+=(ionos7-amd64.debian.net) ;;
+			9|i9|ionos9)	HOSTS+=(ionos9-amd64.debian.net) ;;
+			10|i10|ionos10)	HOSTS+=(ionos10-amd64.debian.net) ;;
+			11|i11|ionos11)	HOSTS+=(ionos11-amd64.debian.net) ;;
+			12|i12|ionos12)	HOSTS+=(ionos12-i386.debian.net) ;;
+			15|i15|ionos15)	HOSTS+=(ionos15-amd64.debian.net) ;;
+			16|i16|ionos16)	HOSTS+=(ionos16-i386.debian.net) ;;
 			o167)		HOSTS+=(osuosl167-amd64.debian.net) ;;
 			o168)		HOSTS+=(osuosl168-amd64.debian.net) ;;
 			o169)		HOSTS+=(osuosl169-amd64.debian.net) ;;


=====================================
update_jdn.sh
=====================================
@@ -328,9 +328,10 @@ if [ -f /etc/debian_version ] ; then
 				# from Debian backports
 				# munin-node from buster-backports requires init-system-helpers>=1.54
 				# which is available in bionic-backports, we only need to convince apt
-				DEBS="$DEBS init-system-helpers/bionic-backports"
-				;;
-			*)	# not available in Ubuntu 16.04:
+				DEBS="$DEBS
+				init-system-helpers/bionic-backports
+				" ;;
+			*)	# packages to be installed on all Debian systems but which are not available in Ubuntu 18.04:
 				DEBS="$DEBS
 				ripgrep
 				mmdebstrap
@@ -350,7 +351,7 @@ if [ -f /etc/debian_version ] ; then
 		case $HOSTNAME in
 			ionos7-a*) DEBS="$DEBS
 				postgresql
-				postgresql-11-debversion
+				postgresql-13-debversion
 				python3-pystache
 				python3-apt
 				python3-psycopg2



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/9e4ebffc4b39d2a4282d382d4c62c8b6bd6d3f26...b108293dfcc0326a4d5acd3a90f0441c2f0260eb

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/9e4ebffc4b39d2a4282d382d4c62c8b6bd6d3f26...b108293dfcc0326a4d5acd3a90f0441c2f0260eb
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/20210228/f283fcc4/attachment-0001.htm>