OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci_run_n_monitor: Always resolve --rev arguments for looking up pipelines.

Browse Source 
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>
This commit is contained in:
Eric Anholt
2023-10-20 12:11:13 +02:00
committed by Marge Bot
parent 9b4fccf4b3
commit 74315051a9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/ci/ci_run_n_monitor.py
View File

@@ -276,7 +276,7 @@ def parse_args() -> None:
mutex_group1 = parser.add_mutually_exclusive_group() mutex_group1 = parser.add_mutually_exclusive_group()
mutex_group1.add_argument( 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( mutex_group1.add_argument(
"--pipeline-url", "--pipeline-url",
@@ -339,8 +339,8 @@ if __name__ == "__main__":
pipe = cur_project.pipelines.get(pipeline_id) pipe = cur_project.pipelines.get(pipeline_id)
REV = pipe.sha REV = pipe.sha
else: else:
if not REV: REV = check_output(['git', 'rev-parse', REV]).decode('ascii').strip()
REV = check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
mesa_project = gl.projects.get("mesa/mesa") mesa_project = gl.projects.get("mesa/mesa")
user_project = get_gitlab_project(gl, args.project) user_project = get_gitlab_project(gl, args.project)
(pipe, cur_project) = wait_for_pipeline([mesa_project, user_project], REV) (pipe, cur_project) = wait_for_pipeline([mesa_project, user_project], REV)