All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Willian Rampazzo" <wrampazz@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [PATCH 1/7] scripts/ci/gitlab-pipeline-status: make branch name configurable
Date: Fri,  4 Sep 2020 12:42:52 -0400	[thread overview]
Message-ID: <20200904164258.240278-2-crosa@redhat.com> (raw)
In-Reply-To: <20200904164258.240278-1-crosa@redhat.com>

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



  reply	other threads:[~2020-09-04 16:44 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-04 16:42 [PATCH 0/7] gitlab pipeline check/watch script improvements Cleber Rosa
2020-09-04 16:42 ` Cleber Rosa [this message]
2020-09-04 17:01   ` [PATCH 1/7] scripts/ci/gitlab-pipeline-status: make branch name configurable Philippe Mathieu-Daudé
2020-09-04 16:42 ` [PATCH 2/7] scripts/ci/gitlab-pipeline-status: improve message regarding timeout Cleber Rosa
2020-09-04 16:53   ` Philippe Mathieu-Daudé
2020-09-04 16:42 ` [PATCH 3/7] scripts/ci/gitlab-pipeline-status: give early feedback on running pipelines Cleber Rosa
2020-09-04 16:59   ` Philippe Mathieu-Daudé
2020-09-04 16:42 ` [PATCH 4/7] scripts/ci/gitlab-pipeline-status: refactor parser creation Cleber Rosa
2020-09-04 16:42 ` [PATCH 5/7] scripts/ci/gitlab-pipeline-status: handle keyboard interrupts Cleber Rosa
2020-09-04 16:42 ` [PATCH 6/7] scripts/ci/gitlab-pipeline-status: use more descriptive exceptions Cleber Rosa
2020-09-04 16:42 ` [PATCH 7/7] scripts/ci/gitlab-pipeline-status: wait for pipeline creation Cleber Rosa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200904164258.240278-2-crosa@redhat.com \
    --to=crosa@redhat.com \
    --cc=bleal@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=wrampazz@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.