[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: update_jdn: drop long obsolete code

[Holger Levsen (@holger)]

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


Commits:
2306ded4 by Holger Levsen at 2023-06-14T02:35:38+02:00
update_jdn: drop long obsolete code

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

- - - - -
65e1e8ba by Holger Levsen at 2023-06-14T02:40:00+02:00
djm: deploy-git: don't fiddle with host clock as this is also (and better) handled by update_jdn.sh

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

- - - - -


2 changed files:

- bin/djm
- update_jdn.sh


Changes:

=====================================
bin/djm
=====================================
@@ -616,9 +616,8 @@ djm_do() {
 						export LANG=C
 						cd ~jenkins-adm
 						if [ ! -d jenkins.debian.net ]; then
-							[ -x /usr/bin/git ] || sudo apt-get install -y git
-							sudo -H -u jenkins-adm git ${GITOPTS:-} clone $GIT_REPO
-							cd jenkins.debian.net
+							echo "Please run init_node manually once."
+							exit 1
 						else
 							cd jenkins.debian.net
 							sudo -H -u jenkins-adm git config pull.ff only
@@ -626,7 +625,8 @@ djm_do() {
 						fi
 						./update_jdn.sh 2>&1 | sudo tee -a /var/log/jenkins/update_jdn.log
 					EOF
-					run_command_futureproof_on_node_in_xterm
+					COMMAND="( $COMMAND ) || ( echo press enter ; read a )"
+					xterm -T "$SHORTNODE / $ACTION" -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "ssh -t $NODE \"update_jdn.sh\"" &
 					;;
 			rmstamp)	COMMAND="sudo rm -f /var/log/jenkins/*stamp"
 					xterm -T "$SHORTNODE / $ACTION" -class deploy-jenkins -bg $BG -fa 'DejaVuSansMono' -fs 10 -e "ssh -t $NODE \"$COMMAND\"" &


=====================================
update_jdn.sh
=====================================
@@ -67,14 +67,6 @@ disable_dsa_check_packages() {
 echo "--------------------------------------------"
 explain "$(date) - begin deployment update."
 
-#
-# temporarily test to check which hosts don't use systemd
-#
-if ! dpkg -l | grep -q systemd-sysv ; then
-	echo "no systemd-sysv installed on $(hostname), please enter to continue…"
-	read
-fi
-
 # some nodes need special treatment…
 case $HOSTNAME in
 	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink9*|codethink11*|codethink13*|codethink15*)
@@ -97,8 +89,6 @@ case $HOSTNAME in
 	*)	;;
 esac
 
-
-
 #
 # set up users and groups
 #



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/fc3a4aeafdc75fb58df41d8030dd1561932d9a95...65e1e8ba1dc6c246fa0827bd0aa1358b14be3c42

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/fc3a4aeafdc75fb58df41d8030dd1561932d9a95...65e1e8ba1dc6c246fa0827bd0aa1358b14be3c42
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/20230614/5d83219e/attachment-0001.htm>