Merge pull request #13203 from willthames/galaxy_10620

Allow tree-ish versions for ansible-galaxy

lib/ansible/galaxy/role.py

@@ -310,5 +310,3 @@ class GalaxyRole(object):
         }
         """
         return dict(scm=self.scm, src=self.src, version=self.version, name=self.name)
-
-

lib/ansible/playbook/role/requirement.py

@@ -190,6 +190,17 @@ class RoleRequirement(RoleDefinition):
         if rc != 0:
             raise AnsibleError ("- command %s failed in directory %s (rc=%s)" % (' '.join(clone_cmd), tempdir, rc))
 
+        if scm == 'git' and version:
+            checkout_cmd = [scm, 'checkout', version]
+            with open('/dev/null', 'w') as devnull:
+                try:
+                    popen = subprocess.Popen(checkout_cmd, cwd=os.path.join(tempdir, name), stdout=devnull, stderr=devnull)
+                except (IOError, OSError):
+                    raise AnsibleError("error executing: %s" % " ".join(checkout_cmd))
+                rc = popen.wait()
+            if rc != 0:
+                raise AnsibleError("- command %s failed in directory %s (rc=%s)" % (' '.join(checkout_cmd), tempdir, rc))
+
         temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.tar')
         if scm == 'hg':
             archive_cmd = ['hg', 'archive', '--prefix', "%s/" % name]

test/integration/galaxy_roles.yml

@@ -3,7 +3,7 @@
   name: oracle_java7
 
 - src: git+http://bitbucket.org/willthames/git-ansible-galaxy
-  version: v1.6
+  version: pr-10620
 
 - src: http://bitbucket.org/willthames/hg-ansible-galaxy
   scm: hg

test/integration/galaxy_rolesfile

@@ -1,7 +1,7 @@
 # deliberate non-empty whitespace line to follow
     
 
-git+https://bitbucket.org/willthames/git-ansible-galaxy,v1.6
+git+https://bitbucket.org/willthames/git-ansible-galaxy,pr-10620
 hg+https://bitbucket.org/willthames/hg-ansible-galaxy
 https://bitbucket.org/willthames/http-ansible-galaxy/get/master.tar.gz,,http-role
 # comment