From a8b6b2367efc9efb3759cf613ec56afecaa1cf4a Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Fri, 16 Dec 2022 00:36:13 +0100 Subject: [PATCH] ci: allow omitting of --rev for ci_run_n_monitor.py When --rev is omitted, try to get revision automatically. Acked-by: Eric Engestrom Reviewed-by: Martin Roukala Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/bin/ci_run_n_monitor.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/bin/ci_run_n_monitor.py b/.gitlab-ci/bin/ci_run_n_monitor.py index 41acf11288e..4ba75c08e75 100755 --- a/.gitlab-ci/bin/ci_run_n_monitor.py +++ b/.gitlab-ci/bin/ci_run_n_monitor.py @@ -13,6 +13,7 @@ and show the job(s) logs. import argparse import re +from subprocess import check_output import sys import time from concurrent.futures import ThreadPoolExecutor @@ -235,7 +236,7 @@ def parse_args() -> None: ) parser.add_argument("--target", metavar="target-job", help="Target job") parser.add_argument( - "--rev", metavar="revision", help="repository git revision", required=True + "--rev", metavar="revision", help="repository git revision (default: HEAD)" ) parser.add_argument( "--token", @@ -279,8 +280,11 @@ if __name__ == "__main__": cur_project = get_gitlab_project(gl, "mesa") - print(f"Revision: {args.rev}") - pipe = wait_for_pipeline(cur_project, args.rev) + REV: str = args.rev + if not REV: + REV = check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip() + print(f"Revision: {REV}") + pipe = wait_for_pipeline(cur_project, REV) print(f"Pipeline: {pipe.web_url}") deps = set() if args.target: