[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] osuosl168 -> openqa-worker, and grant phil access

[Holger Levsen (@holger)]

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


Commits:
8554a531 by Philip Hands at 2022-10-05T14:07:54+02:00
osuosl168 -> openqa-worker, and grant phil access

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

- - - - -


3 changed files:

- README.infrastructure
- − hosts/osuosl167-amd64/etc/apt/sources.list.d/philh-openqa.list
- update_jdn.sh


Changes:

=====================================
README.infrastructure
=====================================
@@ -47,7 +47,7 @@ The nodes are used for these jobs:
 
 * osuosl167: debian-janitor, mmdebstrap-jenkins jobs and openqa.d.n workers
 ** janitor and openqa worker should be split on different nodes
-* osuosl168: UNUSED
+* osuosl168: openqa.d.n workers
 * osuosl170: archlinux (future), alpine
 * osuosl171: openwrt, coreboot, netbsd
 ** is constantly online (in jenkins) now, which is not how we like it and still doesnt solve the netbsd job probs


=====================================
hosts/osuosl167-amd64/etc/apt/sources.list.d/philh-openqa.list deleted
=====================================
@@ -1,2 +0,0 @@
-# This is Phil Hands's repo, where he uploads OpenQA packages that are not yet fit for Debian
-deb [signed-by=/usr/share/keyrings/hands-deb-keyring.gpg] http://ftp.hands.com/hands-deb/ bullseye main


=====================================
update_jdn.sh
=====================================
@@ -138,6 +138,7 @@ user_host_groups['bernhard','osuosl174-amd64']="$sudo_groups"
 user_host_groups['santiago','ionos3-amd64']="$sudo_groups"
 user_host_groups['fpierret','snapshot']="$sudo_groups"
 user_host_groups['rclobus','osuosl173-amd64']="$sudo_groups"
+user_host_groups['phil','osuosl168-amd64']="$sudo_groups"
 
 u_shell['mattia']='/bin/zsh'
 u_shell['lynxis']='/usr/bin/fish'
@@ -469,18 +470,14 @@ if [ -f /etc/debian_version ] ; then
 			;;
 			*) ;;
 		esac
-		if [ "$HOSTNAME" = "osuosl167-amd64" ]; then
-			# for phil only
-			DEBS="$DEBS postfix-pcre"
-			# OpenQA worker -- currently installed with help from:
-			#   hosts/osuosl167-amd64/etc/apt/sources.list.d/philh-openqa.list
-			DEBS="$DEBS
-				openqa-worker
-				"
-			# only needed on the main node
-		elif [ "$HOSTNAME" = "jenkins" ] ; then
+		case $HOSTNAME in
+		osuosl167-amd64|osuosl168-amd64)
+			DEBS="$DEBS openqa-worker"
+			;;
+		jenkins)
 			DEBS="$DEBS ffmpeg python3-popcon dose-extra"
-		fi
+			;;
+		esac
 		# packages needed for snapshot.reproducible-builds.org
 		case $HOSTNAME in
 			snapshot*)	DEBS="$DEBS



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8554a53122c174869dab7b00d4a315b3e35ca651

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8554a53122c174869dab7b00d4a315b3e35ca651
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/20221005/5fec977c/attachment-0001.htm>