Re: [PATCH 1/7] scripts/ci/gitlab-pipeline-status: make branch name configurable

[Philippe Mathieu-Daudé]

On 9/4/20 6:42 PM, Cleber Rosa wrote:
> 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>

Reviewed-by: Philippe Mathieu-Daudé <philmd@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 = ''
>