diff --git a/bob/devtools/scripts/jobs.py b/bob/devtools/scripts/jobs.py index b6c4c870c4276cea599a864c810d957619c79d39..2e3f63258ea901a5c70d8693ab94d73a9fb527da 100644 --- a/bob/devtools/scripts/jobs.py +++ b/bob/devtools/scripts/jobs.py @@ -13,18 +13,23 @@ logger = get_logger(__name__) epilog=""" Examples: - 1. List running jobs on any of our runners + 1. List running jobs on any runners with tag "bob" (default) $ bdt gitlab jobs -vv - 2. List running jobs on a runner defined by its description: + 2. List running jobs on a runner with tag "macos": - $ bdt gitlab jobs -vv macmini + $ bdt gitlab jobs -vv macos + + + 2. List running jobs on a runner with tag "macos" and "foo": + + $ bdt gitlab jobs -vv macos foo """ ) -@click.argument("name", nargs=-1) +@click.argument("tags", nargs=-1) @click.option( "-s", "--status", @@ -36,31 +41,19 @@ Examples: ) @verbosity_option() @bdt.raise_on_error -def jobs(name, status): +def jobs(status, tags): """Lists jobs on a given runner identified by description.""" gl = get_gitlab_instance() gl.auth() - names = name or [ - "linux-shell", - "linux-docker", - "macpro", - "macmini", - "macm1", - ] + tags = tags or ["bob"] # search for the runner(s) to affect - runners = [ - k - for k in gl.runners.list(all=True) - if k.attributes["description"] in names - ] + runners = gl.runners.list(tag_list=tags) if not runners: - raise RuntimeError( - "Cannot find runner with description = %s" % "|".join(names) - ) + raise RuntimeError("Cannot find runner with tags = %s" % "|".join(tags)) for runner in runners: jobs = runner.jobs.list(all=True, status=status) diff --git a/conda/meta.yaml b/conda/meta.yaml index 176a756af28de080eb27b5ba8fcaec7cbf4b0155..5aa391f3f4d57f620efe71c49bc92a77d5acd1c1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -43,7 +43,7 @@ requirements: - gitpython - python-gitlab - requests - - sphinx!=4.0.1 + - sphinx >=4.0.2 - pyyaml >=5.1 - twine <3 - lxml