ci_run_n_monitor: Always resolve --rev arguments for looking up pipelines.
authorEric Anholt <eric@anholt.net>
Fri, 20 Oct 2023 10:11:13 +0000 (12:11 +0200)
committerMarge Bot <emma+marge@anholt.net>
Wed, 25 Oct 2023 01:48:18 +0000 (01:48 +0000)
Otherwise you'd loop forever never finding it with --rev <paste from
gitlab UI> or --rev <branch name>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25824>

bin/ci/ci_run_n_monitor.py

index 5779e4a11d44476484e7a2f7ef0cbacf6543cd6b..5d36b86b24a7e06155c1e8454253d79dc4a9fffe 100755 (executable)
@@ -276,7 +276,7 @@ def parse_args() -> None:
 
     mutex_group1 = parser.add_mutually_exclusive_group()
     mutex_group1.add_argument(
-        "--rev", metavar="revision", help="repository git revision (default: HEAD)"
+        "--rev", default="HEAD", metavar="revision", help="repository git revision (default: HEAD)"
     )
     mutex_group1.add_argument(
         "--pipeline-url",
@@ -339,8 +339,8 @@ if __name__ == "__main__":
             pipe = cur_project.pipelines.get(pipeline_id)
             REV = pipe.sha
         else:
-            if not REV:
-                REV = check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
+            REV = check_output(['git', 'rev-parse', REV]).decode('ascii').strip()
+
             mesa_project = gl.projects.get("mesa/mesa")
             user_project = get_gitlab_project(gl, args.project)
             (pipe, cur_project) = wait_for_pipeline([mesa_project, user_project], REV)