[Git][qa/jenkins.debian.net][master] 2 commits: jenkins nodes: use the same ssh control path for all nodes

[Holger Levsen (@holger)]

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


Commits:
f122ae17 by Holger Levsen at 2025-05-22T19:49:46+02:00
jenkins nodes: use the same ssh control path for all nodes

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

- - - - -
3aab14aa by Holger Levsen at 2025-05-22T19:51:55+02:00
jenkins: make sure the munin user uses the same ssh config as the jenkins user

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

- - - - -


2 changed files:

- jenkins-home/ssh_config.in
- update_jdn.sh


Changes:

=====================================
jenkins-home/ssh_config.in
=====================================
@@ -1,14 +1,16 @@
-Host *
-    HashKnownHosts no
-    ControlMaster no
-    ControlPath ~/.ssh/master-%r@%h:%p
-
 # proxy for riscv64 nodes
 Host lab.rvperf.org
- ControlMaster       auto
- ControlPath         /run/munin/ssh.%h_%p_%r
- ControlPersist      360
- TCPKeepAlive        yes
- ServerAliveInterval 60
+    HashKnownHosts      no
+    ControlMaster       auto
+    ControlPath         ~/.ssh/master-%r@%h:%p
+    ControlPersist      360
+    TCPKeepAlive        yes
+    ServerAliveInterval 60
+
+Host *
+    HashKnownHosts      no
+    ControlMaster       no
+    ControlPath         ~/.ssh/master-%r@%h:%p
+
 
 # update_jdn will append here host specific instructions


=====================================
update_jdn.sh
=====================================
@@ -912,6 +912,9 @@ fi
 sudo -u jenkins cp jenkins-home/gitconfig /var/lib/jenkins/.gitconfig
 sudo -u jenkins cp jenkins-home/ssh_config.in /var/lib/jenkins/.ssh/config
 nodes/gen_ssh_config | sudo -u jenkins tee -a /var/lib/jenkins/.ssh/config > /dev/null
+if [ "$HOSTNAME" = "jenkins" ] ; then
+	cp /var/lib/jenkins/.ssh/config /var/lib/munin/.ssh/config
+fi
 nodes/gen_known_host_file | sudo tee /etc/ssh/ssh_known_hosts > /dev/null
 explain "scripts and configurations for jenkins updated."
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/97d7d818d0c97c3fe9375bbd7e9fccae763cc73e...3aab14aa7655f7845abafc5c1843390616439b0b

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/97d7d818d0c97c3fe9375bbd7e9fccae763cc73e...3aab14aa7655f7845abafc5c1843390616439b0b
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/20250522/1088f6a4/attachment-0001.htm>