Merge lp:~verterok/ols-jenkaas/detect-changes-on-git-heads-take-2 into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Guillermo Gonzalez]

same as before, but if the old_tip doesn't match current HEAD, overrite it with current tip.

same as before, but if the old_tip doesn't match current HEAD, overrite it with current tip.

[Adam Collard (adam-collard)]

Guillermo and I talked and agreed that https://code.launchpad.net/~adam-collard/ols-jenkaas/better-git-changes/+merge/343199 was a better approach

Unmerged revisions

579. By Guillermo Gonzalez on 2018-04-13

same as before, but if the old_tip doesn't match current HEAD, overrite it with current tip.

=== modified file 'project/detect-changes'
--- project/detect-changes	2018-04-13 13:31:06 +0000
+++ project/detect-changes	2018-04-13 13:54:12 +0000
@@ -11,6 +11,10 @@
 VCS=$1
 TRUNK=$2
 JOB_NAME=$3
+REFS="HEAD"
+if [ "$4" != "" ]; then
+    REFS=refs/heads/$4
+fi 
 
 # To get JENKINS_URL
 . /etc/default/jenkins-slave
@@ -45,8 +49,8 @@
 if [ "${VCS}" = "bzr" ] ; then
     bzr version-info --custom --template ${INFO} "{revision_id}" ${TRUNK} > ${TIP}
 else
-    # FIXME: Assuming 'master' -- vila 2016-11-28
-    git ls-remote ${TRUNK} refs/heads/master > ${TIP}
+    git ls-remote ${TRUNK} $REFS > ${TIP}
+    grep $REFS ${OLD_TIP} || cp ${TIP} ${OLD_TIP} 
 fi
 
 # Succeed if a new tip appears