aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCleber Rosa <crosa@redhat.com>2020-09-04 12:42:52 -0400
committerThomas Huth <thuth@redhat.com>2020-10-13 12:48:17 +0200
commitd914375070dc67dead065425fc3e3633fea4e0d3 (patch)
tree6c8126dd7b01f228efec4b0f3f2080261e7dbce2
parent4fb716360a6c19d1860dd312ebd3404ca499a186 (diff)
scripts/ci/gitlab-pipeline-status: make branch name configurable
With the utility function `get_local_staging_branch_commit()`, the name of the branch is hard coded (including in the function name). For extensibility reasons, let's make that configurable. Signed-off-by: Cleber Rosa <crosa@redhat.com> Message-Id: <20200904164258.240278-2-crosa@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rwxr-xr-xscripts/ci/gitlab-pipeline-status12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/ci/gitlab-pipeline-status b/scripts/ci/gitlab-pipeline-status
index 348a49b6a4..194dd4d0bb 100755
--- a/scripts/ci/gitlab-pipeline-status
+++ b/scripts/ci/gitlab-pipeline-status
@@ -23,20 +23,20 @@ import time
import sys
-def get_local_staging_branch_commit():
+def get_local_branch_commit(branch='staging'):
"""
Returns the commit sha1 for the *local* branch named "staging"
"""
- result = subprocess.run(['git', 'rev-parse', 'staging'],
+ result = subprocess.run(['git', 'rev-parse', branch],
stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL,
cwd=os.path.dirname(__file__),
universal_newlines=True).stdout.strip()
- if result == 'staging':
- raise ValueError("There's no local branch named 'staging'")
+ if result == branch:
+ raise ValueError("There's no local branch named '%s'" % branch)
if len(result) != 40:
- raise ValueError("Branch staging HEAD doesn't look like a sha1")
+ raise ValueError("Branch '%s' HEAD doesn't look like a sha1" % branch)
return result
@@ -110,7 +110,7 @@ def main():
'for https://gitlab.com/qemu-project/qemu, that '
'is, "%(default)s"'))
try:
- default_commit = get_local_staging_branch_commit()
+ default_commit = get_local_branch_commit()
commit_required = False
except ValueError:
default_commit = ''