From: Zack Cerza <zack@redhat.com>
Date: Wed, 21 Sep 2016 23:43:39 +0000 (-0600)
Subject: ShamanProject: correct ref precedence
X-Git-Tag: 1.1.0~522^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5c055b26e7e159559f66079fb17e27839dcd1af5;p=teuthology.git

ShamanProject: correct ref precedence

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index cc02a3a54..860e9764e 100644
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -792,10 +792,11 @@ class ShamanProject(GitbuilderProject):
         req_obj['project'] = self.project
         req_obj['flavor'] = flavor
         req_obj['distros'] = '%s/%s' % (self.distro, self.arch)
-        if getattr(self, 'branch', None):
-            req_obj['ref'] = self.branch
-        if self.sha1:
-            req_obj['sha1'] = self.sha1
+        ref_name, ref_val = self._choose_reference().items()[0]
+        if ref_name == 'sha1':
+            req_obj['sha1'] = ref_val
+        else:
+            req_obj['ref'] = ref_val
         req_str = urllib.urlencode(req_obj)
         uri = urlparse.urljoin(
             self.query_url,
diff --git a/teuthology/test/test_packaging.py b/teuthology/test/test_packaging.py
index 2d1ff8451..fc56caca8 100644
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -639,7 +639,7 @@ class TestShamanProject(TestBuilderProject):
                 .test_init_from_remote_base_url(
                     "https://shaman.ceph.com/api/search?status=ready"
                     "&project=ceph&flavor=default"
-                    "&distros=ubuntu%2F14.04%2Fx86_64"
+                    "&distros=ubuntu%2F14.04%2Fx86_64&ref=master"
                 )
 
     def test_init_from_remote_base_url_debian(self):
@@ -657,7 +657,7 @@ class TestShamanProject(TestBuilderProject):
                 .test_init_from_remote_base_url_debian(
                     "https://shaman.ceph.com/api/search?status=ready"
                     "&project=ceph&flavor=default"
-                    "&distros=debian%2F7.1%2Fx86_64"
+                    "&distros=debian%2F7.1%2Fx86_64&ref=master"
                 )
 
     def test_init_from_config_base_url(self):