mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-12-04 07:34:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

bin/ci_run_n_monitor: get git sha from pipeline if specified, instead of requiring --rev to match

Browse Source 
Fixes: 9ce717ab31 ("ci_run_n_monitor: add ability to specify the pipeline to use, instead of auto-detecting it")
Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24366>
This commit is contained in:
Eric Engestrom 2023-07-28 13:09:24 +01:00 committed by Marge Bot
parent f4d24ca414
commit 42021b4d13
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/ci/ci_run_n_monitor.py
View File

@ -239,13 +239,6 @@ def parse_args() -> None:
+ '--target ".*traces" ',
)
parser.add_argument("--target", metavar="target-job", help="Target job")
parser.add_argument(
"--rev", metavar="revision", help="repository git revision (default: HEAD)"
)
parser.add_argument(
"--pipeline-url",
help="URL of the pipeline to use, instead of auto-detecting it.",
)
parser.add_argument(
"--token",
metavar="token",
@ -255,6 +248,16 @@ def parse_args() -> None:
"--force-manual", action="store_true", help="Force jobs marked as manual"
)
parser.add_argument("--stress", action="store_true", help="Stresstest job(s)")
mutex_group1 = parser.add_mutually_exclusive_group()
mutex_group1.add_argument(
"--rev", metavar="revision", help="repository git revision (default: HEAD)"
)
mutex_group1.add_argument(
"--pipeline-url",
help="URL of the pipeline to use, instead of auto-detecting it.",
)
return parser.parse_args()
@ -289,9 +292,6 @@ if __name__ == "__main__":
retry_transient_errors=True)
REV: str = args.rev
if not REV:
REV = check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
print(f"Revision: {REV}")
if args.pipeline_url:
assert args.pipeline_url.startswith(GITLAB_URL)
@ -303,9 +303,14 @@ if __name__ == "__main__":
pipeline_id = int(url_path_components[5])
cur_project = gl.projects.get(project_name)
pipe = cur_project.pipelines.get(pipeline_id)
REV = pipe.sha
else:
cur_project = get_gitlab_project(gl, "mesa")
if not REV:
REV = check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
pipe = wait_for_pipeline(cur_project, REV)
print(f"Revision: {REV}")
print(f"Pipeline: {pipe.web_url}")
deps = set()