]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
buildpackages: branches are found in refs/remotes/origin
authorLoic Dachary <ldachary@redhat.com>
Fri, 9 Oct 2015 08:01:34 +0000 (10:01 +0200)
committerLoic Dachary <ldachary@redhat.com>
Fri, 9 Oct 2015 08:01:34 +0000 (10:01 +0200)
Note in refs/heads which is populated for local branches only and not
after a fresh clone.

Signed-off-by: Loic Dachary <loic@dachary.org>
tasks/buildpackages/make-deb.sh
tasks/buildpackages/make-rpm.sh

index 9bdd91a197ed846a1bf960dc0de090c0c291e006..92926c64a75f7837831db574f0bfae3b792dd996 100755 (executable)
@@ -136,7 +136,7 @@ EOF
     echo $sha1 > $sha1_dir/sha1
     ref_dir=$codename/$base/ref
     mkdir -p $ref_dir
-    ( cd ${ceph_dir} ; git for-each-ref refs/tags/** refs/heads/** ) | grep $sha1 | while read sha1 type ref ; do
+    ( cd ${ceph_dir} ; git for-each-ref refs/tags/** refs/remotes/origin/** ) | grep $sha1 | while read sha1 type ref ; do
         base_ref=$(basename $ref)
         ( cd $ref_dir ; ln -sf ../sha1/$sha1 $base_ref )
     done
index 56ccd40471e385bb67c5dc4c08973ae4e212f435..e3c8f35bbc0f10816443cdb19d6dc6c5523efeed 100755 (executable)
@@ -233,7 +233,7 @@ function build_rpm_repo() {
 
     ref_dir=${buildarea}/../$codename/$base/ref
     mkdir -p $ref_dir
-    ( cd ${ceph_dir} ; git for-each-ref refs/tags/** refs/heads/** ) | grep $sha1 | while read sha1 type ref ; do
+    ( cd ${ceph_dir} ; git for-each-ref refs/tags/** refs/remotes/origin/** ) | grep $sha1 | while read sha1 type ref ; do
         base_ref=$(basename $ref)
         ( cd $ref_dir ; ln -sf ../sha1/$sha1 $base_ref )
     done