[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] deploy_jdn: only do git pulls using fastforward merges

[Holger Levsen]

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


Commits:
482e71a3 by Holger Levsen at 2021-03-13T14:55:59+01:00
deploy_jdn: only do git pulls using fastforward merges

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

- - - - -


2 changed files:

- deploy_jdn
- init_node


Changes:

=====================================
deploy_jdn
=====================================
@@ -184,7 +184,9 @@ 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
+		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 -H -u jenkins-adm git pull ; ./update_jdn.sh
 		read -r -d '' remote_command <<-EOF
 			set -e
@@ -196,6 +198,7 @@ for i in "${HOSTS[@]}" ; do
 				cd jenkins.debian.net
 			else
 				cd jenkins.debian.net
+				sudo -H -u jenkins-adm git config pull.ff only
 				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


=====================================
init_node
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2014-2020 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2021 Holger Levsen <holger at layer-acht.org>
 #
 # released under the GPLv2
 #
@@ -36,6 +36,7 @@ cd ~jenkins-adm
 [ -x /usr/bin/git ] || apt-get install -y git
 su jenkins-adm -l -c "git clone $GIT_REPO"
 cd jenkins.debian.net
+su jenkins-adm -l -c "git config pull.ff only"
 mkdir -p /var/log/jenkins/
 chown jenkins.jenkins /var/log/jenkins/
 set +x



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/482e71a3c9e6c855bafe6d1e294693a72fec9070
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/20210313/682f270e/attachment-0001.htm>