argus-alm 0.11.7__py3-none-any.whl → 0.12.1__py3-none-any.whl

argus/backend/controller/admin_api.py

@@ -6,7 +6,7 @@ from flask import (
     Request,
 )
 from argus.backend.error_handlers import handle_api_exception
-from argus.backend.service.release_manager import ReleaseManagerService
+from argus.backend.service.release_manager import ReleaseEditPayload, ReleaseManagerService
 from argus.backend.service.user import api_login_required, check_roles
 from argus.backend.models.web import UserRoles
 
@@ -92,6 +92,36 @@ def set_release_dormancy():
     }
 
 
+@bp.route("/release/edit", methods=["POST"])
+@check_roles(UserRoles.Admin)
+@api_login_required
+def edit_release():
+    payload: ReleaseEditPayload = get_payload(request)
+    result = ReleaseManagerService().edit_release(payload)
+
+    return {
+        "status": "ok",
+        "response": {
+            "updated": result
+        }
+    }
+
+
+@bp.route("/release/delete", methods=["POST"])
+@check_roles(UserRoles.Admin)
+@api_login_required
+def delete_release():
+    payload = get_payload(request)
+    result = ReleaseManagerService().delete_release(release_id=payload["releaseId"])
+
+    return {
+        "status": "ok",
+        "response": {
+            "deleted": result
+        }
+    }
+
+
 @bp.route("/group/create", methods=["POST"])
 @check_roles(UserRoles.Admin)
 @api_login_required

argus/backend/controller/api.py

@@ -389,9 +389,10 @@ def release_stats_v2():
     release = request.args.get("release")
     limited = bool(int(request.args.get("limited")))
     version = request.args.get("productVersion", None)
+    include_no_version = bool(int(request.args.get("includeNoVersion", True)))
     force = bool(int(request.args.get("force")))
     stats = ReleaseStatsCollector(
-        release_name=release, release_version=version).collect(limited=limited, force=force)
+        release_name=release, release_version=version).collect(limited=limited, force=force, include_no_version=include_no_version)
 
     res = jsonify({
         "status": "ok",

argus/backend/controller/client_api.py

@@ -81,7 +81,11 @@ def run_submit_logs(run_type: str, run_id: str):
 @bp.route("/testrun/<string:run_type>/<string:run_id>/finalize", methods=["POST"])
 @api_login_required
 def run_finalize(run_type: str, run_id: str):
-    result = ClientService().finish_run(run_type=run_type, run_id=run_id)
+    try:
+        payload = get_payload(request)
+    except Exception:
+        payload = None
+    result = ClientService().finish_run(run_type=run_type, run_id=run_id, payload=payload)
     return {
         "status": "ok",
         "response": result

argus/backend/models/web.py

@@ -111,6 +111,7 @@ class ArgusRelease(Model):
     pretty_name = columns.Text()
     description = columns.Text()
     github_repo_url = columns.Text()
+    valid_version_regex = columns.Text()
     assignee = columns.List(value_type=columns.UUID)
     picture_id = columns.UUID()
     enabled = columns.Boolean(default=lambda: True)

argus/backend/plugins/core.py

@@ -38,6 +38,7 @@ class PluginModelBase(Model):
     heartbeat = columns.Integer(default=lambda: int(time()))
     end_time = columns.DateTime(default=lambda: datetime.utcfromtimestamp(0))
     build_job_url = columns.Text()
+    product_version = columns.Text(index=True)
 
     # Test Logs Collection
     logs = columns.List(value_type=columns.Tuple(columns.Text(), columns.Text()))
@@ -180,10 +181,13 @@ class PluginModelBase(Model):
     def submit_product_version(self, version: str):
         raise NotImplementedError()
 
+    def set_product_version(self, version: str):
+        self.product_version = version
+
     def submit_logs(self, logs: list[dict]):
         raise NotImplementedError()
 
-    def finish_run(self):
+    def finish_run(self, payload: dict = None):
         raise NotImplementedError()
 
 

argus/backend/plugins/driver_matrix_tests/controller.py

@@ -0,0 +1,24 @@
+from flask import Blueprint, request
+
+from argus.backend.error_handlers import handle_api_exception
+from argus.backend.service.user import api_login_required
+from argus.backend.plugins.driver_matrix_tests.service import DriverMatrixService
+
+bp = Blueprint("driver_matrix_api", __name__, url_prefix="/driver_matrix")
+bp.register_error_handler(Exception, handle_api_exception)
+
+
+@bp.route("/test_report", methods=["GET"])
+@api_login_required
+def driver_matrix_test_report():
+
+    build_id = request.args.get("buildId")
+    if not build_id:
+        raise Exception("No build id provided")
+    
+
+    result = DriverMatrixService().tested_versions_report(build_id=build_id)
+    return {
+        "status": "ok",
+        "response": result
+    }

argus/backend/plugins/driver_matrix_tests/model.py

@@ -166,7 +166,7 @@ class DriverTestRun(PluginModelBase):
     def submit_product_version(self, version: str):
         self.scylla_version = version
 
-    def finish_run(self):
+    def finish_run(self, payload: dict = None):
         self.end_time = datetime.utcnow()
 
     def submit_logs(self, logs: list[dict]):

argus/backend/plugins/driver_matrix_tests/plugin.py

@@ -2,6 +2,7 @@ from flask import Blueprint
 
 from argus.backend.plugins.core import PluginInfoBase, PluginModelBase
 from argus.backend.plugins.driver_matrix_tests.model import DriverTestRun
+from argus.backend.plugins.driver_matrix_tests.controller import bp as driver_matrix_api_bp
 from argus.backend.plugins.driver_matrix_tests.udt import TestCollection, EnvironmentInfo, TestCase, TestSuite
 
 
@@ -9,7 +10,7 @@ class PluginInfo(PluginInfoBase):
     # pylint: disable=too-few-public-methods
     name: str = "driver-matrix-tests"
     model: PluginModelBase = DriverTestRun
-    controller: Blueprint = None
+    controller: Blueprint = driver_matrix_api_bp
     all_models = [
         DriverTestRun,
     ]

argus/backend/plugins/driver_matrix_tests/service.py

@@ -0,0 +1,42 @@
+from argus.backend.db import ScyllaCluster
+from argus.backend.models.web import ArgusRelease, ArgusTest
+from argus.backend.plugins.driver_matrix_tests.model import DriverTestRun
+
+
+class DriverMatrixService:
+    def tested_versions_report(self, build_id: str) -> dict:
+        db = ScyllaCluster.get()
+        all_runs_for_test_query = db.prepare(f"SELECT * FROM {DriverTestRun.table_name()} WHERE build_id = ?")
+
+        rows = list(db.session.execute(all_runs_for_test_query, parameters=(build_id,)).all())
+
+        if len(rows) == 0:
+            raise Exception(f"No results for build_id {build_id}", build_id)
+
+        latest = rows[0]
+        try:
+            test: ArgusTest = ArgusTest.get(id=latest["test_id"])
+            release: ArgusRelease = ArgusRelease.get(id=latest["release_id"])
+        except (ArgusTest.DoesNotExist, ArgusRelease.DoesNotExist):
+            raise Exception(f"Unable to find release and test information for build_id {build_id} and run_id {latest['id']}", build_id, latest["id"])
+        
+
+        version_map = {}
+
+        for row in rows:
+            driver_versions = [(col["name"], col["driver"]) for col in row["test_collection"]]
+            for version, driver_type in driver_versions:
+                driver_type = driver_type if driver_type else "Unknown"
+                versions: list = version_map.get(driver_type, [])
+                if version not in versions:
+                    versions.append(version)
+                    versions.sort()
+                version_map[driver_type] = versions
+
+        response = {
+            "release": release.name,
+            "test": test.name,
+            "build_id": build_id,
+            "versions": version_map,
+        }
+        return response

argus/backend/plugins/generic/model.py

@@ -0,0 +1,76 @@
+from datetime import datetime
+from uuid import UUID
+from cassandra.cqlengine import columns
+from cassandra.cqlengine.models import Model
+from argus.backend.db import ScyllaCluster
+from argus.backend.models.web import ArgusRelease
+from argus.backend.plugins.core import PluginModelBase
+from argus.backend.plugins.generic.types import GenericRunFinishRequest, GenericRunSubmitRequest
+from argus.backend.util.enums import TestStatus
+
+
+class GenericPluginException(Exception):
+    pass
+
+
+class GenericRun(PluginModelBase):
+    _plugin_name = "generic"
+    __table_name__ = "generic_run"
+    logs = columns.Map(key_type=columns.Text(), value_type=columns.Text())
+    started_by = columns.Text()
+    # TODO: Legacy field name, should be renamed to product_version and abstracted
+    scylla_version = columns.Text()
+
+    @classmethod
+    def _stats_query(cls) -> str:
+        return ("SELECT id, test_id, group_id, release_id, status, start_time, build_job_url, build_id, "
+                f"assignee, end_time, investigation_status, heartbeat, scylla_version FROM {cls.table_name()} WHERE release_id = ?")
+
+    @classmethod
+    def get_distinct_product_versions(cls, release: ArgusRelease, cluster: ScyllaCluster = None) -> list[str]:
+        if not cluster:
+            cluster = ScyllaCluster.get()
+        statement = cluster.prepare(f"SELECT scylla_version FROM {cls.table_name()} WHERE release_id = ?")
+        rows = cluster.session.execute(query=statement, parameters=(release.id,))
+        unique_versions = {r["scylla_version"] for r in rows if r["scylla_version"]}
+
+        return sorted(list(unique_versions), reverse=True)
+
+    def submit_product_version(self, version: str):
+        self.scylla_version = version
+        self.set_product_version(version)
+
+    @classmethod
+    def load_test_run(cls, run_id: UUID) -> 'GenericRun':
+        return cls.get(id=run_id)
+
+    @classmethod
+    def submit_run(cls, request_data: GenericRunSubmitRequest) -> 'GenericRun':
+        try:
+            run = cls.get(id=request_data["run_id"])
+            raise GenericPluginException(f"Run with UUID {request_data['run_id']} already exists.", request_data["run_id"])
+        except cls.DoesNotExist:
+            pass
+        run = cls()
+        run.start_time = datetime.utcnow()
+        run.build_id = request_data["build_id"]
+        run.started_by = request_data["started_by"]
+        run.id = request_data["run_id"]
+        run.build_job_url = request_data["build_url"]
+        run.assign_categories()
+        try:
+            run.assignee = run.get_scheduled_assignee()
+        except Model.DoesNotExist:
+            run.assignee = None
+        if version := request_data.get("scylla_version"):
+            run.submit_product_version(version)
+        run.status = TestStatus.RUNNING.value
+        run.save()
+
+        return run
+
+    def finish_run(self, payload: GenericRunFinishRequest = None):
+        self.end_time = datetime.utcnow()
+        self.status = TestStatus(payload["status"]).value
+        if version := payload.get("scylla_version"):
+            self.submit_product_version(version)

argus/backend/plugins/generic/plugin.py

@@ -0,0 +1,16 @@
+from flask import Blueprint
+
+from argus.backend.plugins.core import PluginInfoBase, PluginModelBase
+from argus.backend.plugins.generic.model import GenericRun
+
+
+class PluginInfo(PluginInfoBase):
+    # pylint: disable=too-few-public-methods
+    name: str = "generic"
+    model: PluginModelBase = GenericRun
+    controller: Blueprint = None
+    all_models = [
+        GenericRun
+    ]
+    all_types = [
+    ]

argus/backend/plugins/generic/types.py

@@ -0,0 +1,13 @@
+from typing import TypedDict
+
+class GenericRunSubmitRequest(TypedDict):
+    build_id: str
+    build_url: str
+    run_id: str
+    started_by: str
+    scylla_version: str | None
+
+
+class GenericRunFinishRequest(TypedDict):
+    status: str
+    scylla_version: str | None

argus/backend/plugins/sct/service.py

@@ -383,7 +383,7 @@ class SCTService:
                     "aborted": 0,
                 }
             )
-            if run["status"] in ["passed", "failed", "aborted"]:
+            if run["status"] in ["passed", "failed", "aborted", "test_error"]:
                 metadata[run["status"]] += 1
             kernel_metadata[kernel_package["version"]] = metadata
 

argus/backend/plugins/sct/testrun.py

@@ -47,9 +47,9 @@ class SCTTestRunSubmissionRequest():
     job_url: str
     started_by: str
     commit_id: str
-    origin_url: str | None
-    branch_name: str | None
     sct_config: dict | None
+    origin_url: Optional[str] = field(default=None)
+    branch_name: Optional[str] = field(default=None)
     runner_public_ip: Optional[str] = field(default=None)
     runner_private_ip: Optional[str] = field(default=None)
 
@@ -60,6 +60,7 @@ class SCTTestRun(PluginModelBase):
 
     # Test Details
     test_name = columns.Text()
+    stress_duration = columns.Float()
     scm_revision_id = columns.Text()
     branch_name = columns.Text()
     origin_url = columns.Text()
@@ -181,6 +182,8 @@ class SCTTestRun(PluginModelBase):
 
         if req.sct_config:
             backend = req.sct_config.get("cluster_backend")
+            if duration_override := req.sct_config.get("stress_duration"):
+                run.stress_duration = float(duration_override)
             region_key = SCT_REGION_PROPERTY_MAP.get(backend, SCT_REGION_PROPERTY_MAP["default"])
             raw_regions = req.sct_config.get(region_key) or "undefined_region"
             regions = raw_regions.split() if isinstance(raw_regions, str) else raw_regions
@@ -212,7 +215,7 @@ class SCTTestRun(PluginModelBase):
     def submit_product_version(self, version: str):
         self.scylla_version = version
 
-    def finish_run(self):
+    def finish_run(self, payload: dict = None):
         self.end_time = datetime.utcnow()
 
     def submit_logs(self, logs: list[dict]):

argus/backend/plugins/sct/udt.py

@@ -20,6 +20,8 @@ class CloudInstanceDetails(UserType):
     region = columns.Text()
     public_ip = columns.Text()
     private_ip = columns.Text()
+    dc_name = columns.Text()
+    rack_name = columns.Text()
     creation_time = columns.Integer(default=lambda: int(time()))
     termination_time = columns.Integer(default=lambda: 0)
     termination_reason = columns.Text(default=lambda: "")

argus/backend/plugins/sirenada/model.py

@@ -65,7 +65,7 @@ class SirenadaRun(PluginModelBase):
     def submit_logs(self, logs: dict[str, str]):
         raise SirenadaPluginException("Log submission is not supported for Sirenada")
 
-    def finish_run(self):
+    def finish_run(self, payload: dict = None):
         raise SirenadaPluginException("Sirenada runs do not need finalization")
 
     @classmethod

argus/backend/service/client_service.py

@@ -62,10 +62,10 @@ class ClientService:
 
         return "Submitted"
 
-    def finish_run(self, run_type: str, run_id: str) -> str:
+    def finish_run(self, run_type: str, run_id: str, payload: dict | None = None) -> str:
         model = self.get_model(run_type)
         run = model.load_test_run(UUID(run_id))
-        run.finish_run()
+        run.finish_run(payload)
         run.save()
 
         return "Finalized"

argus/backend/service/release_manager.py

@@ -1,4 +1,5 @@
 import logging
+from typing import TypedDict
 from uuid import UUID
 from argus.backend.db import ScyllaCluster
 from argus.backend.plugins.sct.testrun import SCTTestRun
@@ -11,6 +12,16 @@ class ReleaseManagerException(Exception):
     pass
 
 
+class ReleaseEditPayload(TypedDict):
+    id: str
+    pretty_name: str
+    description: str
+    valid_version_regex: str | None
+    enabled: bool
+    perpetual: bool
+    dormant: bool
+
+
 class ReleaseManagerService:
     def __init__(self) -> None:
         self.session = ScyllaCluster.get_session()
@@ -156,6 +167,33 @@ class ReleaseManagerService:
 
         return True
 
+    def edit_release(self, payload: ReleaseEditPayload) -> bool:
+
+        release: ArgusRelease = ArgusRelease.get(id=payload["id"])
+        release.pretty_name = payload["pretty_name"]
+        release.perpetual = payload["perpetual"]
+        release.enabled = payload["enabled"]
+        release.dormant = payload["dormant"]
+        release.description = payload["description"]
+        release.valid_version_regex = payload["valid_version_regex"]
+
+
+        release.save()
+        return True
+
+    def delete_release(self, release_id: str) -> bool:
+
+        release: ArgusRelease = ArgusRelease.get(id=release_id)
+
+        release_groups = ArgusGroup.filter(release_id=release.id)
+        release_tests = ArgusTest.filter(release_id=release.id)
+
+        for entity in [*release_groups.all(), *release_tests.all()]:
+            entity.delete()
+
+        release.delete()
+        return True
+
     def batch_move_tests(self, new_group_id: str, tests: list[str]) -> bool:
         group = ArgusGroup.get(id=UUID(new_group_id))
 

argus/backend/service/stats.py

@@ -33,6 +33,7 @@ class TestRunStatRow(TypedDict):
 class ComparableTestStatus:
     PRIORITY_MAP = {
         TestStatus.FAILED: 10,
+        TestStatus.TEST_ERROR: 10,
         TestStatus.ABORTED: 9,
         TestStatus.RUNNING: 8,
         TestStatus.CREATED: 7,
@@ -126,7 +127,7 @@ def generate_field_status_map(
         field_name = "status",
         container_class = TestStatus,
         cmp_class = ComparableTestStatus
-    ) -> dict[int, str]:
+    ) -> dict[int, tuple[str, TestRunStatRow]]:
 
     status_map = {}
     for run in last_runs:
@@ -136,7 +137,7 @@ def generate_field_status_map(
                 if cmp_class(container_class(status)) < cmp_class(container_class(run[field_name])):
                     status_map[run_number] = run[field_name]
             case _:
-                status_map[run_number] = run[field_name]
+                status_map[run_number] = (run[field_name], run)
     return status_map
 
 
@@ -279,6 +280,7 @@ class TestStats:
         self.has_comments = False
         self.schedules = schedules if schedules else tuple()
         self.is_scheduled = len(self.schedules) > 0
+        self.tracked_run_number = None
 
     def to_dict(self) -> dict:
         return {
@@ -288,7 +290,8 @@ class TestStats:
             "last_runs": self.last_runs,
             "start_time": self.start_time,
             "hasBugReport": self.has_bug_report,
-            "hasComments": self.has_comments
+            "hasComments": self.has_comments,
+            "buildNumber": self.tracked_run_number,
         }
 
     def collect(self, limited=False):
@@ -305,11 +308,10 @@ class TestStats:
             self.parent_group.increment_status(status=self.status)
             return
         status_map = generate_field_status_map(last_runs)
-        investigation_status_map = generate_field_status_map(
-            last_runs, "investigation_status", TestInvestigationStatus, ComparableTestInvestigationStatus)
 
-        self.status = status_map.get(get_build_number(last_run["build_job_url"]))
-        self.investigation_status = investigation_status_map.get(get_build_number(last_run["build_job_url"]))
+        worst_case = status_map.get(get_build_number(last_run["build_job_url"]))
+        self.status = worst_case[0]
+        self.investigation_status = worst_case[1]["investigation_status"]
         self.start_time = last_run["start_time"]
 
         self.parent_group.increment_status(status=self.status)
@@ -318,6 +320,7 @@ class TestStats:
 
         self.last_runs = [
             {
+                "id": run["id"],
                 "status": run["status"],
                 "build_number": get_build_number(run["build_job_url"]),
                 "build_job_name": run["build_id"],
@@ -327,10 +330,18 @@ class TestStats:
                 "comments": [dict(i.items()) for i in self.parent_group.parent_release.comments if i.test_run_id == run["id"]],
             }
             for run in last_runs
-        ][:5]
-        self.has_bug_report = len(self.last_runs[0]["issues"]) > 0
+        ]
+        try:
+            target_run = next(run for run in self.last_runs if run["id"] == worst_case[1]["id"])
+        except StopIteration:
+            target_run = worst_case[1]
+            target_run["issues"] = [dict(i.items()) for i in self.parent_group.parent_release.issues if i.run_id == target_run["id"]]
+            target_run["comments"] = [dict(i.items()) for i in self.parent_group.parent_release.comments if i.test_run_id == target_run["id"]]
+        self.has_bug_report = len(target_run["issues"]) > 0
         self.parent_group.parent_release.has_bug_report = self.has_bug_report or self.parent_group.parent_release.has_bug_report
-        self.has_comments = len(self.last_runs[0]["comments"]) > 0
+        self.has_comments = len(target_run["comments"]) > 0
+        self.last_runs = self.last_runs[:5]
+        self.tracked_run_number = target_run.get("build_number", get_build_number(target_run.get("build_job_url")))
 
 
 class ReleaseStatsCollector:
@@ -343,7 +354,7 @@ class ReleaseStatsCollector:
         self.release_name = release_name
         self.release_version = release_version
 
-    def collect(self, limited=False, force=False) -> dict:
+    def collect(self, limited=False, force=False, include_no_version=False) -> dict:
         self.release: ArgusRelease = ArgusRelease.get(name=self.release_name)
         self.release_rows = [row for plugin in all_plugin_models()
                              for row in plugin.get_stats_for_release(release=self.release)]
@@ -353,8 +364,18 @@ class ReleaseStatsCollector:
             }
 
         if self.release_version:
-            self.release_rows = list(
-                filter(lambda row: row["scylla_version"] == self.release_version or not row["scylla_version"], self.release_rows))
+            if include_no_version:
+                expr = lambda row: row["scylla_version"] == self.release_version or not row["scylla_version"] 
+            elif self.release_version == "!noVersion":
+                expr = lambda row: not row["scylla_version"]
+            else:
+                expr = lambda row: row["scylla_version"] == self.release_version
+        else:
+            if include_no_version:
+                expr = lambda row: row
+            else:
+                expr = lambda row: row["scylla_version"]
+        self.release_rows = list(filter(expr, self.release_rows))
 
         self.release_stats = ReleaseStats(release=self.release)
         self.release_stats.collect(rows=self.release_rows, limited=limited, force=force)

argus/backend/service/testrun.py

@@ -341,7 +341,7 @@ class TestRunService:
             }
         )
         if issue_request.status_code != 200:
-            raise Exception(f"Error getting issue state: Response: HTTP {issue_request.status_code}", issue_request)
+            raise Exception(f"Error getting issue state: Response: HTTP {issue_request.status_code}", issue_request.json())
 
         issue_state: dict[str, Any] = issue_request.json()
 

argus/backend/util/enums.py

@@ -14,6 +14,7 @@ class TestStatus(str, Enum):
     CREATED = "created"
     RUNNING = "running"
     FAILED = "failed"
+    TEST_ERROR = "test_error"
     ERROR = "error"
     PASSED = "passed"
     ABORTED = "aborted"

argus/client/base.py

@@ -170,12 +170,14 @@ class ArgusClient:
             }
         )
 
-    def finalize_run(self, run_type: str, run_id: UUID) -> requests.Response:
+    def finalize_run(self, run_type: str, run_id: UUID, body: dict = None) -> requests.Response:
+        body = body if body else {}
         return self.post(
             endpoint=self.Routes.FINALIZE,
             location_params={"type": run_type, "id": str(run_id)},
             body={
                 **self.generic_body,
+                **body,
             }
         )
 

argus/client/generic/cli.py

@@ -0,0 +1,47 @@
+import click
+import logging
+from argus.backend.util.enums import TestStatus
+
+from argus.client.generic.client import ArgusGenericClient
+
+LOGGER = logging.getLogger(__name__)
+
+
+@click.group
+def cli():
+    pass
+
+
+@click.command("submit")
+@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("--id", required=True, help="UUID (v4 or v1) unique to the job")
+@click.option("--build-id", required=True, help="Unique job identifier in the build system, e.g. scylla-master/group/job for jenkins (The full path)")
+@click.option("--build-url", required=True, help="Job URL in the build system")
+@click.option("--started-by", required=True, help="Username of the user who started the job")
+@click.option("--scylla-version", required=False, default=None, help="Version of Scylla used for this job")
+def submit_run(api_key: str, base_url: str, id: str, build_id: str, build_url: str, started_by: str, scylla_version: str = None):
+    LOGGER.info("Submitting %s (%s) to Argus...", build_id, id)
+    client = ArgusGenericClient(auth_token=api_key, base_url=base_url)
+    client.submit_generic_run(build_id=build_id, run_id=id, started_by=started_by, build_url=build_url, scylla_version=scylla_version)
+    LOGGER.info("Done.")
+
+
+@click.command("finish")
+@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("--id", required=True, help="UUID (v4 or v1) unique to the job")
+@click.option("--status", required=True, help="Resulting job status")
+@click.option("--scylla-version", required=False, default=None, help="Version of Scylla used for this job")
+def finish_run(api_key: str, base_url: str, id: str, status: str, scylla_version: str = None):
+    client = ArgusGenericClient(auth_token=api_key, base_url=base_url)
+    status = TestStatus(status)
+    client.finalize_generic_run(run_id=id, status=status, scylla_version=scylla_version)
+
+
+cli.add_command(submit_run)
+cli.add_command(finish_run)
+
+
+if __name__ == "__main__":
+    cli()

argus/client/generic/client.py

@@ -0,0 +1,31 @@
+import logging
+from argus.client.base import ArgusClient
+
+
+LOGGER = logging.getLogger(__name__)
+
+class ArgusGenericClient(ArgusClient):
+    test_type = "generic"
+    schema_version: None = "v1"
+    def __init__(self, auth_token: str, base_url: str, api_version="v1") -> None:
+        super().__init__(auth_token, base_url, api_version)
+
+    def submit_generic_run(self, build_id: str, run_id: str, started_by: str, build_url: str, scylla_version: str | None = None):
+        request_body = {
+            "build_id": build_id,
+            "run_id": run_id,
+            "started_by": started_by,
+            "build_url": build_url,
+            "scylla_version": scylla_version
+        }
+
+        response = self.submit_run(run_type=self.test_type, run_body=request_body)
+        self.check_response(response)
+
+
+    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={
+            "status": status,
+            "scylla_version": scylla_version,
+        })
+        self.check_response(response)

argus/client/sct/client.py

@@ -148,7 +148,7 @@ class ArgusSCTClient(ArgusClient):
         self.check_response(response)
 
     def create_resource(self, name: str, resource_type: str, public_ip: str, private_ip: str,
-                        region: str, provider: str, shards_amount: int, state=ResourceState.RUNNING) -> None:
+                        region: str, provider: str, dc_name: str, rack_name: str, shards_amount: int, state=ResourceState.RUNNING) -> None:
         """
             Creates a cloud resource record in argus.
         """
@@ -164,6 +164,8 @@ class ArgusSCTClient(ArgusClient):
                     "instance_details": {
                         "provider": provider,
                         "region": region,
+                        "dc_name": dc_name,
+                        "rack_name": rack_name,
                         "public_ip": public_ip,
                         "private_ip": private_ip,
                         "shards_amount": shards_amount,

{argus_alm-0.11.7.dist-info → argus_alm-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: argus-alm
-Version: 0.11.7
+Version: 0.12.1
 Summary: Argus
 Home-page: https://github.com/scylladb/argus
 License: Apache-2.0
@@ -11,6 +11,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: requests (>=2.26.0,<3.0.0)
 Project-URL: Repository, https://github.com/scylladb/argus
 Description-Content-Type: text/markdown

{argus_alm-0.11.7.dist-info → argus_alm-0.12.1.dist-info}/RECORD

@@ -4,10 +4,10 @@ argus/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argus/backend/cli.py,sha256=EZFI70CIaHNt93ARvEkNanbC0_nB7loIPq9giEQ3P2s,1342
 argus/backend/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argus/backend/controller/admin.py,sha256=2z29RX7ZQO_VTklSKH9RrEj-Ag2SsvyOaIzWDKr0ahQ,575
-argus/backend/controller/admin_api.py,sha256=6-BSQpeaMIq1WNAJX_rIe5x3-aslDDfolzhKHOu3yvM,5545
-argus/backend/controller/api.py,sha256=hnIarcxOyujdy7FcuH68gWvh-6AtmjImLi3xgF088eQ,13332
+argus/backend/controller/admin_api.py,sha256=9CkewYmnqKJpSKoXyKDMxuMziyAWQ1lRD3dMSh5R3PI,6249
+argus/backend/controller/api.py,sha256=_hLJcO__jFMB4kFonkwVgUkYdLLQTSvCrCLQKKrvgr8,13450
 argus/backend/controller/auth.py,sha256=nwF_5uZLxPOCLm2ljLyw2OxGur6fmPM7WAAoGJLI_kk,2030
-argus/backend/controller/client_api.py,sha256=zixOLNTAZ8_dWWPXCdGPiJHbJPffr7t-tbh8ZDkoSzI,2897
+argus/backend/controller/client_api.py,sha256=SM6HRlnoguxkPrqHzm42b5JsoQ2b8-1hTtfLWe832hc,3007
 argus/backend/controller/main.py,sha256=XQLwGPXm0MlDIq-Bb84xYiiksmbE0oSjDAwMdDd14BE,8296
 argus/backend/controller/notification_api.py,sha256=wz7V4nE6Mxclpq78P8gNnCyeQ7xA9BBJjZ-dPhLLd2I,1964
 argus/backend/controller/notifications.py,sha256=zMSJln72BGU6Q_nQvJesMnuvJ57Ucbov4M2ZI-37Bxo,290
@@ -18,48 +18,54 @@ argus/backend/db.py,sha256=bBiraYD05Qex28yZHjSP1bRlcMsc6oTYGt792zXmaHo,4101
 argus/backend/error_handlers.py,sha256=IEjz7Vzfldv1PTOeHrpRWmRsgBrHtAW0PXHUJZDovAE,480
 argus/backend/events/event_processors.py,sha256=bsmBayiXvlGn3aqiT2z9WgwnVBRtn2cRqkgn4pLodck,1291
 argus/backend/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/backend/models/web.py,sha256=FHTWehdnlOPVX_2jXo0aaA68ruuXr6UHt3yKNB1Ch2Y,12165
+argus/backend/models/web.py,sha256=dUWQQaw5TivSCOuGQqAxIH9yVraGXX7sayNBloIS3n8,12206
 argus/backend/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/backend/plugins/core.py,sha256=z-p5Cj-dci4mYQ6PtEwCQXEhvubDfXvJEcqC6nYMonM,7446
-argus/backend/plugins/driver_matrix_tests/controller.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/backend/plugins/driver_matrix_tests/model.py,sha256=-DTr-e9LiLaZ5Ra4k00-QmGDJIIKSt4dI0SYnZQJqwc,6800
-argus/backend/plugins/driver_matrix_tests/plugin.py,sha256=NZN6lpHFpNuBkv2D_gGHh03402z0qlOeCWjgZXRs2c4,637
+argus/backend/plugins/core.py,sha256=Tit-JlybrFCSsqoKjp_BFmtaxRk_AiocGOKqMfBovj4,7604
+argus/backend/plugins/driver_matrix_tests/controller.py,sha256=9Q6QCripzM528SGsQnYupM6k7HW7hUzkNyjJFiXXfEw,739
+argus/backend/plugins/driver_matrix_tests/model.py,sha256=Ay_Q6EAF4CwAW0fejdia4zyKcZOc943eZWT5nWIefYM,6822
+argus/backend/plugins/driver_matrix_tests/plugin.py,sha256=72ESU7s8C6ovVMfJTlYwtaokdvRp_HJF1_czm1UMhKg,745
 argus/backend/plugins/driver_matrix_tests/raw_types.py,sha256=A108HCnv5q0RHfNRhUJrTpRy3fG7sPxr9Sk4gfsbooU,600
+argus/backend/plugins/driver_matrix_tests/service.py,sha256=dxb8VGTJLIyVqVrZ4RtzCXgnmS2qg2RAGhcp_SARt9I,1737
 argus/backend/plugins/driver_matrix_tests/udt.py,sha256=6lydzF3AQHm3GR5bKEDu1xLPYsLaBL3o-wu9NpabbqA,1134
+argus/backend/plugins/generic/model.py,sha256=y5-eJRxMm8L2zDRVXcG-ZK7mrslZ5rGPTv-ihXFt9Yc,3096
+argus/backend/plugins/generic/plugin.py,sha256=5URbQVUCizrk-KZqb6I0P_8nLUekjYh-Js7ZLKVoBAA,407
+argus/backend/plugins/generic/types.py,sha256=jlZUcQ7r153ziyl3ZJmix7AzL2G1aX9N_z-4Kw9trWc,267
 argus/backend/plugins/loader.py,sha256=0MmGNBVle51tIyH7lA7Lz2L8PcGKGub9vyFuwnLm840,1320
 argus/backend/plugins/sct/controller.py,sha256=ek4gNiraDzd81QMpHKCzpugUSkwbXCHKAPsjD9ol6CE,4791
 argus/backend/plugins/sct/plugin.py,sha256=3TlX5NAd7bv4aMI9FJNJLkf8o2bcahZhZobAV4xAbzU,965
 argus/backend/plugins/sct/resource_setup.py,sha256=hwfAOu-oKOH42tjtzJhiqwq_MtUE9_HevoFyql8JKqY,10120
-argus/backend/plugins/sct/service.py,sha256=VR9fEwc43Y9nFW9__Lvbm613VIb1lp5Y3P3dXm-LwRk,17618
-argus/backend/plugins/sct/testrun.py,sha256=sZW7ZzjX4I2ni1tTKt68T0Kp6x0IwaJsAThgNwNchxU,9168
+argus/backend/plugins/sct/service.py,sha256=fiwnIE4guVOnw5c8g8xwOSr5BoTI_AoyVzJkWYhnQ5A,17632
+argus/backend/plugins/sct/testrun.py,sha256=qU-81IRs7UYTs5ozcDlATLZWGUp6I8X3XOIVJoz9RFc,9416
 argus/backend/plugins/sct/types.py,sha256=avLL3fzug_n6GbtlW8bcPewcDGi1DxHFD0vp-JZ7hdQ,969
-argus/backend/plugins/sct/udt.py,sha256=KVVkzaiEeyKs2ntFjXQ6BpoBjX4kLuSK-csgIVyNK00,2819
-argus/backend/plugins/sirenada/model.py,sha256=npKs6GurFXgddOVEiD5hmPwCPi7RPAi9HFs-3s99C8w,4661
+argus/backend/plugins/sct/udt.py,sha256=oP2xzUGy2o4fVICcZyGyvLWapR2Rox-Myp_FTXHmxlQ,2879
+argus/backend/plugins/sirenada/model.py,sha256=ku9jITNf9wU0YZJ9JwkopJYCC2MKek1M1Q7aPKZzt5M,4683
 argus/backend/plugins/sirenada/plugin.py,sha256=AlQAakwy3u-OqAqqK3RonUR5oDm-JoiwBUDUF3YEVP4,447
 argus/backend/plugins/sirenada/types.py,sha256=Gm3XMK9YJoozVaeM9XE7n8iRxA6PKBrS23Mo2vJfdLs,697
 argus/backend/service/admin.py,sha256=_VnWl3CkZBOAie_pPbd9sbXZUpBf2SApyNoFZLfB_QI,637
 argus/backend/service/argus_service.py,sha256=o415BalaQ-FP5CDSjeypiXJ4ejaVVXqive25syPhRdM,24192
 argus/backend/service/build_system_monitor.py,sha256=_Bxugk4CCh2z-I-i74QMPe7M8j0dmBMDri2dd3WGVew,7328
-argus/backend/service/client_service.py,sha256=_eH-sq8507oKXXtMFDAg2kUc445qQucr2fC6pKbmjZc,2290
+argus/backend/service/client_service.py,sha256=CS5esppd9s-SgUYE-HVLkfz-MrN8zxPouf9e4VlPV_M,2326
 argus/backend/service/event_service.py,sha256=iYeqxN2QCYTjYB1WPPv4BEFLXG0Oz3TvskkaK4v9pVY,654
 argus/backend/service/notification_manager.py,sha256=h00Ej_-hH9H7pq0wah_1TH8dnpPyPNsgVJNO1rwJi7o,7011
-argus/backend/service/release_manager.py,sha256=v2yg45oWBpK_uwqkHtJHPTPbe21_cJu3skmzeaChVhw,6259
-argus/backend/service/stats.py,sha256=FjVmpHTNwRFOC79pzu8gz49yM8lUwcroTfjzCq0laiY,14102
+argus/backend/service/release_manager.py,sha256=DymV5OI53ClRdc4p7jlCGT6xPqrjIxHjs8EDiyWffqQ,7362
+argus/backend/service/stats.py,sha256=4WEtd5gdzT-dzOjD1NUHdBfVurxnwXcawjseu-kqxHw,15167
 argus/backend/service/team_manager_service.py,sha256=zY5dvy3ffvQbJuXBvlWKE5dS5LQ3ss6tkFE-cwFZsdw,3010
-argus/backend/service/testrun.py,sha256=p0vRGkQYEsDxWzi0JLH-l8ijDyDcmMNeallMk5VrOds,19699
+argus/backend/service/testrun.py,sha256=ggjTcWjyvsPXSSv_v80rrp3bHaqCOjcxYEewXrW9AXg,19706
 argus/backend/service/user.py,sha256=N3t43rgKMnSsPXU5R9bigEEGbPjYrc6MsJtof3z7kDE,9027
 argus/backend/template_filters.py,sha256=hD8eDyBYp-X6JVoyQhM-TWYv3MuyorAv0Emz728iGcU,523
 argus/backend/util/common.py,sha256=fmE9cKnJ1CX_Cz4Mw1d_M-T-jwPh8DkKr_fLAx8LY9M,1458
 argus/backend/util/config.py,sha256=Sm0LCRkabYaSUkXNPglyjMr45GCDBNXqJLkmB_s51f0,860
 argus/backend/util/encoders.py,sha256=VxOnUanHP9FjcaobYupV-pZ3Udzrrrq7zZcbNpVXaKM,646
-argus/backend/util/enums.py,sha256=ASL-mqhEtjBKAB-5YDSvGXe7amKjiVv0Q-Gf6eJNbUM,719
+argus/backend/util/enums.py,sha256=EhTQrgedlEz5sDYJ1gFnE2eC2nc1neQCRgzOgssQvWY,749
 argus/backend/util/logsetup.py,sha256=XWyFLC1_J5G8NcR7oC9l-Pf02ybAvEZR95y5LoY4W48,2438
 argus/backend/util/module_loaders.py,sha256=AcIlX-VRmUQ2THFKT8DLefLSE62Eub2hCxIosg3WgE0,698
 argus/backend/util/send_email.py,sha256=Bb2Hta7WlBCvDKga0_WPFWgxWJEfKpectOGypgf9xzo,3217
 argus/client/__init__.py,sha256=bO9_j5_jK5kvTHR46KEZ0Y-p0li7CBW8QSd-K5Ez4vA,42
-argus/client/base.py,sha256=WHYDUSFhhvAyzU3pKPohlsKifxwifx0vWA42VoAha9M,6676
+argus/client/base.py,sha256=-R-BINTolY06lUQLOLGlsWzza4fBdtLBW-4V3NT64vg,6755
 argus/client/driver_matrix_tests/client.py,sha256=3LIS2hwZ3wVKtQDEMiQGBsIoIcpKi29chheF_yRM704,7800
-argus/client/sct/client.py,sha256=mZ2_kr95iS0F9rUTciEOZ_bNc4jlMKT4iapncR-wTxc,10082
+argus/client/generic/cli.py,sha256=IJkgEZ5VOAeqp5SlLM13Y5m8e34Cqnyz8WkfeKoN7so,2208
+argus/client/generic/client.py,sha256=l4PDjDy65Mm2OI9ZLSnyd8_2i4Ei1Pp9yRt3bRX8s2Y,1114
+argus/client/sct/client.py,sha256=0xRIeYtjTFGfDS03klSTFie3uxrQqB51xkeOW223MiQ,10204
 argus/client/sct/types.py,sha256=VLgVe7qPmJtCLqtPnuX8N8kMKZq-iY3SKz68nvU6nJ4,371
 argus/client/sirenada/client.py,sha256=ilcyLXJb-0gKbmb9WSPr-Yvldh73joGBhRDoilQoSJ4,6220
 argus/db/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,7 +76,8 @@ argus/db/db_types.py,sha256=iLbmrUaDzrBw0kDCnvW0FSZ9-kNc3uQY-fsbIPymV4E,3612
 argus/db/interface.py,sha256=HroyA1Yijz5cXLdYbxorHCEu0GH9VeMMqB36IHTlcew,17146
 argus/db/testrun.py,sha256=0YG7FIH5FLQeNlYULxC6rhhyru2rziSMe3qKtYzTBnc,26014
 argus/db/utils.py,sha256=YAWsuLjUScSgKgdaL5aF4Sgr13gqH29Mb5cLctX4V_w,337
-argus_alm-0.11.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-argus_alm-0.11.7.dist-info/METADATA,sha256=EB9KDY8eTj3-hjylCscgjBDi6gBI1WDeQC3uj0Jg8mg,6824
-argus_alm-0.11.7.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-argus_alm-0.11.7.dist-info/RECORD,,
+argus_alm-0.12.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+argus_alm-0.12.1.dist-info/METADATA,sha256=_jA8O6J6pa-brcL9f3uwicRdisjfvBwtT-fWXyLP9-c,6862
+argus_alm-0.12.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+argus_alm-0.12.1.dist-info/entry_points.txt,sha256=zEqrAK95P8AAhKbwO4lgrQzKBWqCzHH9zlUPCaCVHoQ,69
+argus_alm-0.12.1.dist-info/RECORD,,

{argus_alm-0.11.7.dist-info → argus_alm-0.12.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 1.6.1
 Root-Is-Purelib: true
 Tag: py3-none-any

argus_alm-0.12.1.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+argus-client-generic=argus.client.generic.cli:cli
+