argus-alm 0.13.0__py3-none-any.whl → 0.13.1__py3-none-any.whl

argus/client/generic/cli.py

@@ -1,3 +1,5 @@
+import json
+from pathlib import Path
 import click
 import logging
 
@@ -39,8 +41,26 @@ def finish_run(api_key: str, base_url: str, id: str, status: str, scylla_version
     client.finalize_generic_run(run_id=id, status=status, scylla_version=scylla_version)
 
 
+@click.command("trigger-jobs")
+@click.option("--api-key", help="Argus API key for authorization", required=True)
+@click.option("--base-url", default="https://argus.scylladb.com", help="Base URL for argus instance")
+@click.option("--version", help="Scylla version to filter plans by", default=None, required=False)
+@click.option("--plan-id", help="Specific plan id for filtering", default=None, required=False)
+@click.option("--release", help="Release name to filter plans by", default=None, required=False)
+@click.option("--job-info-file", required=True, help="JSON file with trigger information (see detailed docs)")
+def trigger_jobs(api_key: str, base_url: str, job_info_file: str, version: str, plan_id: str, release: str):
+    client = ArgusGenericClient(auth_token=api_key, base_url=base_url)
+    path = Path(job_info_file)
+    if not path.exists():
+        LOGGER.error("File not found: %s", job_info_file)
+        exit(128)
+    payload = json.load(path.open("rt", encoding="utf-8"))
+    client.trigger_jobs({ "release": release, "version": version, "plan_id": plan_id, **payload })
+
+
 cli.add_command(submit_run)
 cli.add_command(finish_run)
+cli.add_command(trigger_jobs)
 
 
 if __name__ == "__main__":

argus/client/generic/client.py

@@ -7,6 +7,10 @@ LOGGER = logging.getLogger(__name__)
 class ArgusGenericClient(ArgusClient):
     test_type = "generic"
     schema_version: None = "v1"
+
+    class Routes(ArgusClient.Routes):
+        TRIGGER_JOBS = "/planning/plan/trigger"
+
     def __init__(self, auth_token: str, base_url: str, api_version="v1") -> None:
         super().__init__(auth_token, base_url, api_version)
 
@@ -22,6 +26,24 @@ class ArgusGenericClient(ArgusClient):
         response = self.submit_run(run_type=self.test_type, run_body=request_body)
         self.check_response(response)
 
+    def trigger_jobs(self, common_params: dict[str, str], params: list[dict[str, str]], version: str = None, release: str = None, plan_id: str = None):
+        request_body = {
+            "common_params": common_params,
+            "params": params,
+            "version": version,
+            "release": release,
+            "plan_id": plan_id,
+        }
+        response = self.post(
+            endpoint=self.Routes.TRIGGER_JOBS,
+            location_params={},
+            body={
+                **self.generic_body,
+                **request_body,
+            }
+        )
+        self.check_response(response)
+        return response.json()
 
     def finalize_generic_run(self, run_id: str, status: str, scylla_version: str | None = None):
         response = self.finalize_run(run_type=self.test_type, run_id=run_id, body={

argus/client/generic_result.py

@@ -62,6 +62,7 @@ class ResultTableMeta(type):
             cls_instance.description = meta.description
             cls_instance.columns = meta.Columns
             cls_instance.column_types = {column.name: column.type for column in cls_instance.columns}
+            cls_instance.sut_package_name = getattr(meta, 'sut_package_name', '')
             cls_instance.rows = []
             validation_rules = getattr(meta, 'ValidationRules', {})
             for col_name, rule in validation_rules.items():
@@ -98,7 +99,6 @@ class GenericResultTable(metaclass=ResultTableMeta):
     Base class for all Generic Result Tables in Argus. Use it as a base class for your result table.
     """
     sut_timestamp: int = 0  # automatic timestamp based on SUT version. Works only with SCT and refers to Scylla version.
-    sut_details: str = ""
     results: list[Cell] = field(default_factory=list)
 
     def as_dict(self) -> dict:
@@ -112,12 +112,12 @@ class GenericResultTable(metaclass=ResultTableMeta):
             "description": self.description,
             "columns_meta": [column.as_dict() for column in self.columns],
             "rows_meta": rows,
-            "validation_rules": {k: v.as_dict() for k, v in self.validation_rules.items()}
+            "validation_rules": {k: v.as_dict() for k, v in self.validation_rules.items()},
+            "sut_package_name": self.sut_package_name,
         }
         return {
             "meta": meta_info,
             "sut_timestamp": self.sut_timestamp,
-            "sut_details": self.sut_details,
             "results": [result.as_dict() for result in self.results]
         }
 

argus/client/sct/client.py

@@ -56,7 +56,7 @@ class ArgusSCTClient(ArgusClient):
         response = super().set_status(run_type=self.test_type, run_id=self.run_id, new_status=new_status)
         self.check_response(response)
 
-    def set_sct_runner(self, public_ip: str, private_ip: str, region: str, backend: str) -> None:
+    def set_sct_runner(self, public_ip: str, private_ip: str, region: str, backend: str, name: str = None) -> None:
         """
             Sets runner information for an SCT run.
         """
@@ -69,6 +69,7 @@ class ArgusSCTClient(ArgusClient):
                 "private_ip": private_ip,
                 "region": region,
                 "backend": backend,
+                "name": name,
             }
         )
         self.check_response(response)

{argus_alm-0.13.0.dist-info → argus_alm-0.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: argus-alm
-Version: 0.13.0
+Version: 0.13.1
 Summary: Argus
 Home-page: https://github.com/scylladb/argus
 License: Apache-2.0

{argus_alm-0.13.0.dist-info → argus_alm-0.13.1.dist-info}/RECORD

@@ -3,18 +3,18 @@ argus/client/__init__.py,sha256=bO9_j5_jK5kvTHR46KEZ0Y-p0li7CBW8QSd-K5Ez4vA,42
 argus/client/base.py,sha256=SLOakgME2i49yZSgA59pH8dTdsXjl_nwuofDkP01p88,7988
 argus/client/driver_matrix_tests/cli.py,sha256=6BMiesOd3f20giUk700OPSP6qvV9byD1Ti6zqG-DAeo,6341
 argus/client/driver_matrix_tests/client.py,sha256=whhx3IYkXDWD6n5c9BjKEgSsG7OqmsWCnLIUeeoAmc4,2742
-argus/client/generic/cli.py,sha256=0Qf1hBFEvuQ_CXXxdIRmr6XSO1_6U1DVYO6KsLD3EDM,2202
-argus/client/generic/client.py,sha256=l4PDjDy65Mm2OI9ZLSnyd8_2i4Ei1Pp9yRt3bRX8s2Y,1114
-argus/client/generic_result.py,sha256=QmEi-vrKeBsZto0SUk6Rwayy2UF3MP79WLSiuiiVXRI,4257
-argus/client/sct/client.py,sha256=Foo4IR-q3d5fX3zqk-DZOPO-eam2jJB_cvdm-VIe-V8,11327
+argus/client/generic/cli.py,sha256=uZqS_gWc4uLfPndbO78ofUx8wLiY5f_bWRlQL6qBpNg,3360
+argus/client/generic/client.py,sha256=bSpIdXpG_jY67-z4sg2BLO4ZxcZEJzQVmZV0H3pQ7SE,1849
+argus/client/generic_result.py,sha256=tZe9IvbhCy-drk31t0FQwVL2EdkF5m8Iwkn4VHGmiK0,4324
+argus/client/sct/client.py,sha256=Nnl0v-4O5I7JQqxBUN3qGMBGx_7jGQ4-HifRO0a_-cA,11375
 argus/client/sct/types.py,sha256=VLgVe7qPmJtCLqtPnuX8N8kMKZq-iY3SKz68nvU6nJ4,371
 argus/client/sirenada/client.py,sha256=8gLjJ-TDAi2pvHEhQ7m_zyHOLILu3JsknapF5tuUGXg,6211
 argus/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argus/common/enums.py,sha256=EhTQrgedlEz5sDYJ1gFnE2eC2nc1neQCRgzOgssQvWY,749
 argus/common/sct_types.py,sha256=Gw1y4iqYguqNqTh_GopLDFho8vuGaOGuK7fjaHYhAOQ,1326
 argus/common/sirenada_types.py,sha256=Gm3XMK9YJoozVaeM9XE7n8iRxA6PKBrS23Mo2vJfdLs,697
-argus_alm-0.13.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-argus_alm-0.13.0.dist-info/METADATA,sha256=6BuBweYUslUYhgMydiNuFDW6Jdh3iWqxy5pO0ThtZmA,3406
-argus_alm-0.13.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-argus_alm-0.13.0.dist-info/entry_points.txt,sha256=pcYW8nxZuDaymxE8tn86K0dq8eEodUdiS0sSvwEQ_zU,137
-argus_alm-0.13.0.dist-info/RECORD,,
+argus_alm-0.13.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+argus_alm-0.13.1.dist-info/METADATA,sha256=msV017U_CdxRr-OmP0rZvVV_mqSJz8hRq3LMjzx8mtM,3406
+argus_alm-0.13.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+argus_alm-0.13.1.dist-info/entry_points.txt,sha256=pcYW8nxZuDaymxE8tn86K0dq8eEodUdiS0sSvwEQ_zU,137
+argus_alm-0.13.1.dist-info/RECORD,,