[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: please forgive my finger memory and accept the old shortcuts ☹

Mattia Rizzolo gitlab at salsa.debian.org
Wed Jan 27 16:01:08 GMT 2021 


Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
59ced5c5 by Mattia Rizzolo at 2021-01-27T16:37:18+01:00
please forgive my finger memory and accept the old shortcuts ☹

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
206bb5e5 by Mattia Rizzolo at 2021-01-27T16:39:15+01:00
deploy_jdn: add some missing ionos hosts to the list

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
59e2708d by Mattia Rizzolo at 2021-01-27T17:00:14+01:00
deploy_jdn: set the correct HOME when running git, to avoid warnings

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
faeea06e by Mattia Rizzolo at 2021-01-27T17:00:55+01:00
update cs12 to ubuntu 18.04

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- deploy_jdn
- + hosts/codethink12-arm64/etc/apt/sources.list


Changes:

=====================================
deploy_jdn
=====================================
@@ -106,15 +106,18 @@ elif [ "$1" = "jenkins" ] ; then
 	shift
 	for i in "$@" ; do
 		case "$i" in
-			1|ionos1)	HOSTS+=(ionos1-amd64.debian.net) ;;
-			2|ionos2)	HOSTS+=(ionos2-i386.debian.net) ;;
-			5|ionos5)	HOSTS+=(ionos5-amd64.debian.net) ;;
-			6|ionos6)	HOSTS+=(ionos6-i386.debian.net) ;;
-			7|ionos7)	HOSTS+=(ionos7-amd64.debian.net) ;;
-			9|ionos9)	HOSTS+=(ionos9-amd64.debian.net) ;;
-			10|ionos10)	HOSTS+=(ionos10-amd64.debian.net) ;;
-			11|ionos11)	HOSTS+=(ionos11-amd64.debian.net) ;;
-			15|ionos15)	HOSTS+=(ionos15-amd64.debian.net) ;;
+			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) ;;
 			o167)		HOSTS+=(osuosl167-amd64.debian.net) ;;
 			o168)		HOSTS+=(osuosl168-amd64.debian.net) ;;
 			o169)		HOSTS+=(osuosl169-amd64.debian.net) ;;
@@ -123,14 +126,14 @@ elif [ "$1" = "jenkins" ] ; then
 			o172)		HOSTS+=(osuosl172-amd64.debian.net) ;;
 			o173)		HOSTS+=(osuosl173-amd64.debian.net) ;;
 			o174)		HOSTS+=(osuosl174-amd64.debian.net) ;;
-			c9|ct9)		HOSTS+=(codethink9-arm64.debian.net) ;;
-			c10|ct10)	HOSTS+=(codethink10-arm64.debian.net) ;;
-			c11|ct11)	HOSTS+=(codethink11-arm64.debian.net) ;;
-			c12|ct12)	HOSTS+=(codethink12-arm64.debian.net) ;;
-			c13|ct13)	HOSTS+=(codethink13-arm64.debian.net) ;;
-			c14|ct14)	HOSTS+=(codethink14-arm64.debian.net) ;;
-			c15|ct15)	HOSTS+=(codethink15-arm64.debian.net) ;;
-			c16|ct16)	HOSTS+=(codethink16-arm64.debian.net) ;;
+			c9|cs9|ct9)		HOSTS+=(codethink9-arm64.debian.net) ;;
+			c10|cs10|ct10)	HOSTS+=(codethink10-arm64.debian.net) ;;
+			c11|cs11|ct11)	HOSTS+=(codethink11-arm64.debian.net) ;;
+			c12|cs12|ct12)	HOSTS+=(codethink12-arm64.debian.net) ;;
+			c13|cs13|ct13)	HOSTS+=(codethink13-arm64.debian.net) ;;
+			c14|cs14|ct14)	HOSTS+=(codethink14-arm64.debian.net) ;;
+			c15|cs15|ct15)	HOSTS+=(codethink15-arm64.debian.net) ;;
+			c16|cs16|ct16)	HOSTS+=(codethink16-arm64.debian.net) ;;
 			armhf|amd64|i386|arm64)	 HOSTS+=($(echo "${ALL_HOSTS[@]}" | sed -e 's# #\n#g' | grep "$i")) ;;
 			*) 	if ping -c 1 "$i" ; then HOSTS+=("$i") ; fi ;;
 		esac
@@ -161,18 +164,18 @@ HOSTS=("${STSOH[@]}")
 for i in "${HOSTS[@]}" ; do
 	if [ -z "$real_command" ]; then
 		if node_in_the_future "$i"; then GITOPTS="-c http.sslVerify=false" ; fi
-		# real command, for running manually: cd ~jenkins-adm/jenkins.debian.net/ ; sudo -u jenkins-adm git pull ; ./update_jdn.sh
+		# real command, for running manually: cd ~jenkins-adm/jenkins.debian.net/ ; sudo -H -u jenkins-adm git pull ; ./update_jdn.sh
 		read -r -d '' remote_command <<-EOF
 			set -e
 			export LANG=C
 			cd ~jenkins-adm
 			if [ ! -d jenkins.debian.net ]; then
 				[ -x /usr/bin/git ] || sudo apt-get install -y git
-				sudo -u jenkins-adm git ${GITOPTS:-} clone $GIT_REPO
+				sudo -H -u jenkins-adm git ${GITOPTS:-} clone $GIT_REPO
 				cd jenkins.debian.net
 			else
 				cd jenkins.debian.net
-				sudo -u jenkins-adm git ${GITOPTS:-} pull $GIT_REPO
+				sudo -H -u jenkins-adm git ${GITOPTS:-} pull $GIT_REPO
 			fi
 			./update_jdn.sh 2>&1 | sudo tee -a /var/log/jenkins/update_jdn.log
 		EOF


=====================================
hosts/codethink12-arm64/etc/apt/sources.list
=====================================
@@ -0,0 +1,11 @@
+deb http://gb.ports.ubuntu.com/ubuntu-ports/ bionic main universe
+deb http://gb.ports.ubuntu.com/ubuntu-ports/ bionic-updates main universe
+deb http://gb.ports.ubuntu.com/ubuntu-ports/ bionic-backports main universe
+
+deb http://ports.ubuntu.com/ubuntu-ports bionic-security main universe
+
+## we're using some buster-backports on these old 18.04 LTS systems
+deb http://deb.debian.org/debian/ buster-backports main
+
+# for debian-archive-keyring
+deb http://gb.ports.ubuntu.com/ubuntu-ports/ focal main universe



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/17df430ddcebc6a80bdd31a9fecf1167956ce3ed...faeea06ef6561a64f8fe07db7cf6d88c15da6458

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/17df430ddcebc6a80bdd31a9fecf1167956ce3ed...faeea06ef6561a64f8fe07db7cf6d88c15da6458
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/20210127/f8068524/attachment-0001.html>

More information about the Qa-jenkins-scm mailing list