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>
This commit is contained in:
parent
4fb716360a
commit
d914375070
@ -23,20 +23,20 @@ import time
|
|||||||
import sys
|
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"
|
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,
|
stdin=subprocess.DEVNULL,
|
||||||
stdout=subprocess.PIPE,
|
stdout=subprocess.PIPE,
|
||||||
stderr=subprocess.DEVNULL,
|
stderr=subprocess.DEVNULL,
|
||||||
cwd=os.path.dirname(__file__),
|
cwd=os.path.dirname(__file__),
|
||||||
universal_newlines=True).stdout.strip()
|
universal_newlines=True).stdout.strip()
|
||||||
if result == 'staging':
|
if result == branch:
|
||||||
raise ValueError("There's no local branch named 'staging'")
|
raise ValueError("There's no local branch named '%s'" % branch)
|
||||||
if len(result) != 40:
|
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
|
return result
|
||||||
|
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ def main():
|
|||||||
'for https://gitlab.com/qemu-project/qemu, that '
|
'for https://gitlab.com/qemu-project/qemu, that '
|
||||||
'is, "%(default)s"'))
|
'is, "%(default)s"'))
|
||||||
try:
|
try:
|
||||||
default_commit = get_local_staging_branch_commit()
|
default_commit = get_local_branch_commit()
|
||||||
commit_required = False
|
commit_required = False
|
||||||
except ValueError:
|
except ValueError:
|
||||||
default_commit = ''
|
default_commit = ''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user