[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/7] scripts/ci/gitlab-pipeline-status: make branch name configur
From: |
Cleber Rosa |
Subject: |
[PATCH 1/7] scripts/ci/gitlab-pipeline-status: make branch name configurable |
Date: |
Fri, 4 Sep 2020 12:42:52 -0400 |
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>
---
scripts/ci/gitlab-pipeline-status | 12 ++++++------
1 file 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 = ''
--
2.25.4
- [PATCH 0/7] gitlab pipeline check/watch script improvements, Cleber Rosa, 2020/09/04
- [PATCH 2/7] scripts/ci/gitlab-pipeline-status: improve message regarding timeout, Cleber Rosa, 2020/09/04
- [PATCH 3/7] scripts/ci/gitlab-pipeline-status: give early feedback on running pipelines, Cleber Rosa, 2020/09/04
- [PATCH 6/7] scripts/ci/gitlab-pipeline-status: use more descriptive exceptions, Cleber Rosa, 2020/09/04
- [PATCH 7/7] scripts/ci/gitlab-pipeline-status: wait for pipeline creation, Cleber Rosa, 2020/09/04
- [PATCH 4/7] scripts/ci/gitlab-pipeline-status: refactor parser creation, Cleber Rosa, 2020/09/04
- [PATCH 1/7] scripts/ci/gitlab-pipeline-status: make branch name configurable,
Cleber Rosa <=
- [PATCH 5/7] scripts/ci/gitlab-pipeline-status: handle keyboard interrupts, Cleber Rosa, 2020/09/04