21

Author: earthmant

ecosystem_cicd_tools/release.py

@@ -60,11 +60,14 @@ def get_commit(commit_id=None, repo=None):
 def create_release(name, version, message, commit, repo=None):
     logging.info('Attempting to create new release {name}.'.format(name=name))
     repo = repo or get_repository()
-    commit = get_commit(commit)
-    if not commit:
+    if isinstance(commit, Commit.Commit):
+        commit = commit.commit
+    try:
+        return repo.create_git_release(
+            tag=version, name=name, message=message,
+            target_commitish=commit)
+    except AssertionError:
         return repo.create_git_release(tag=version, name=name, message=message)
-    return repo.create_git_release(
-        tag=version, name=name, message=message, target_commitish=commit)
 
 
 def get_release(name, repo=None):
@@ -128,13 +131,15 @@ def update_release(name, message, commit, prerelease=False, repo=None):
         'for repo {repo} {message}.'.format(
             name=name, repo=repo.name, message=message))
     release = repo.get_release(name)
-    commit = get_commit(commit)
-    if not commit:
-        return repo.update_release(
+    if isinstance(commit, Commit.Commit):
+        commit = commit.commit
+    try:
+        return release.update_release(
+            name, message, draft=False, prerelease=prerelease,
+            target_commitish=commit)
+    except AssertionError:
+        return release.update_release(
             name, message, draft=False, prerelease=prerelease)
-    return release.update_release(
-        name, message, draft=False, prerelease=prerelease,
-        target_commitish=commit)
 
 
 def update_latest_release_resources(most_recent_release, name='latest'):

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='cloudify-ecosystem-test',
-    version='2.2.20',
+    version='2.2.21',
     license='LICENSE',
     packages=[
         'ecosystem_tests',