argus-alm 0.12.0b1__py3-none-any.whl → 0.12.2__py3-none-any.whl

argus/backend/controller/testrun_api.py

@@ -6,6 +6,7 @@ from flask import (
 )
 
 from argus.backend.error_handlers import handle_api_exception
+from argus.backend.service.jenkins_service import JenkinsService
 from argus.backend.service.testrun import TestRunService
 from argus.backend.service.user import api_login_required
 from argus.backend.util.common import get_payload
@@ -285,3 +286,54 @@ def ignore_jobs():
             "affectedJobs": result
         }
     }
+
+
+@bp.route("/jenkins/params", methods=["POST"])
+@api_login_required
+def get_jenkins_job_params():
+
+    payload = get_payload(request)
+    service = JenkinsService()
+
+    result = service.retrieve_job_parameters(build_id=payload["buildId"], build_number=payload["buildNumber"])
+
+    return {
+        "status": "ok",
+        "response": {
+            "parameters": result
+        }
+    }
+
+
+@bp.route("/jenkins/build", methods=["POST"])
+@api_login_required
+def build_jenkins_job():
+
+    payload = get_payload(request)
+    service = JenkinsService()
+
+    result = service.build_job(build_id=payload["buildId"], params=payload["parameters"])
+
+    return {
+        "status": "ok",
+        "response": {
+            "queueItem": result
+        }
+    }
+
+
+@bp.route("/jenkins/queue_info")
+@api_login_required
+def get_queue_info():
+    queue_item = request.args.get("queueItem")
+    if not queue_item:
+        raise Exception("No queueItem provided")
+    service = JenkinsService()
+    result = service.get_queue_info(int(queue_item))
+
+    return {
+        "status": "ok",
+        "response": {
+            "queueItem": result
+        }
+    }

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,6 +181,9 @@ 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()
 

argus/backend/plugins/generic/model.py

@@ -38,6 +38,7 @@ class GenericRun(PluginModelBase):
 
     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':

argus/backend/service/jenkins_service.py

@@ -0,0 +1,63 @@
+from typing import Any, TypedDict
+import xml.etree.ElementTree as ET
+import jenkins
+import logging
+
+from flask import current_app, g
+
+LOGGER = logging.getLogger(__name__)
+
+
+class Parameter(TypedDict):
+    _class: str
+    name: str
+    description: str
+    value: Any
+
+
+class JenkinsService:
+    RESERVED_PARAMETER_NAME = "requested_by_user"
+
+    def __init__(self) -> None:
+        self._jenkins = jenkins.Jenkins(url=current_app.config["JENKINS_URL"],
+                                        username=current_app.config["JENKINS_USER"],
+                                        password=current_app.config["JENKINS_API_TOKEN"])
+
+    def retrieve_job_parameters(self, build_id: str, build_number: int) -> list[Parameter]:
+        job_info = self._jenkins.get_build_info(name=build_id, number=build_number)
+        raw_config = self._jenkins.get_job_config(name=build_id)
+        config = ET.fromstring(raw_config)
+        parameter_defs = config.find("*//parameterDefinitions")
+        if parameter_defs:
+            descriptions = {
+                define.findtext("name"): f"{define.findtext('description', '')}" + f" (default: <span class=\"fw-bold\">{define.findtext('defaultValue')}</span>)" if define.findtext('defaultValue') else ""
+                for define in parameter_defs.iterfind("hudson.model.StringParameterDefinition")
+            }
+        else:
+            descriptions = {}
+        params = next(a for a in job_info["actions"] if a.get("_class", "#NONE") == "hudson.model.ParametersAction")["parameters"]
+        params = [param for param in params if param["name"] != self.RESERVED_PARAMETER_NAME]
+        for idx, param in enumerate(params):
+            params[idx]["description"] = descriptions.get(param["name"], "")
+
+        return params
+
+    def build_job(self, build_id: str, params: dict, user_override: str = None):
+        queue_number = self._jenkins.build_job(build_id, {
+            **params,
+            self.RESERVED_PARAMETER_NAME: g.user.username if not user_override else user_override
+        })
+        return queue_number
+
+    def get_queue_info(self, queue_item: int):
+        build_info = self._jenkins.get_queue_item(queue_item)
+        LOGGER.info("%s", build_info)
+        executable = build_info.get("executable")
+        if executable:
+            return executable
+        else:
+            return {
+                "why": build_info["why"],
+                "inQueueSince": build_info["inQueueSince"],
+                "taskUrl": build_info["task"]["url"],
+            }

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,

argus/client/driver_matrix_tests/client.py

@@ -110,8 +110,8 @@ class ArgusDriverMatrixClient(ArgusClient):
             raw_cases.append({
                 "name": case.attrib["name"],
                 "status": status,
-                "time": float(case.attrib["time"]),
-                "classname": case.attrib["classname"],
+                "time": float(case.attrib.get("time", 0.0)),
+                "classname": case.attrib.get("classname", ""),
                 "message": message,
             })
 

{argus_alm-0.12.0b1.dist-info → argus_alm-0.12.2.dist-info}/METADATA

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

{argus_alm-0.12.0b1.dist-info → argus_alm-0.12.2.dist-info}/RECORD

@@ -13,21 +13,21 @@ argus/backend/controller/notification_api.py,sha256=wz7V4nE6Mxclpq78P8gNnCyeQ7xA
 argus/backend/controller/notifications.py,sha256=zMSJln72BGU6Q_nQvJesMnuvJ57Ucbov4M2ZI-37Bxo,290
 argus/backend/controller/team.py,sha256=G6LdIBaYgfG0Qr4RhNQ53MZVdh4wcuotsIIpFwhTJ3w,3101
 argus/backend/controller/team_ui.py,sha256=B7N1_Kzl6Rac8BV3FbKj55pGAS_dht47rYhAi94PC8A,589
-argus/backend/controller/testrun_api.py,sha256=9XUPnnZb942V0Y_cY0ESKVugWui7qrrO1ec6WJW2y2U,7872
+argus/backend/controller/testrun_api.py,sha256=JhSzstTWkcYPiMKQikeWaYjTPSlvNyHHRany11TQUGo,9070
 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=dUWQQaw5TivSCOuGQqAxIH9yVraGXX7sayNBloIS3n8,12206
 argus/backend/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/backend/plugins/core.py,sha256=KPUCDDp4uNyJ2c4SeNIdEkmEHbsEXOr-Qt-rmhtmrNw,7468
+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=6K8IEc65EpPYj9nL3ETn25mogOx3xfwq4-ZsuMSVkns,3054
+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
@@ -46,9 +46,10 @@ argus/backend/service/argus_service.py,sha256=o415BalaQ-FP5CDSjeypiXJ4ejaVVXqive
 argus/backend/service/build_system_monitor.py,sha256=_Bxugk4CCh2z-I-i74QMPe7M8j0dmBMDri2dd3WGVew,7328
 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/jenkins_service.py,sha256=BnUvVi1iUvvD99lnscs-kxPGA9LExxNUsgwfO-46tq8,2518
 argus/backend/service/notification_manager.py,sha256=h00Ej_-hH9H7pq0wah_1TH8dnpPyPNsgVJNO1rwJi7o,7011
 argus/backend/service/release_manager.py,sha256=DymV5OI53ClRdc4p7jlCGT6xPqrjIxHjs8EDiyWffqQ,7362
-argus/backend/service/stats.py,sha256=BDzMb-DKUMyoJ7KAMHaphwTLRQywSMWV5a4hTOFDGLg,15132
+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=ggjTcWjyvsPXSSv_v80rrp3bHaqCOjcxYEewXrW9AXg,19706
 argus/backend/service/user.py,sha256=N3t43rgKMnSsPXU5R9bigEEGbPjYrc6MsJtof3z7kDE,9027
@@ -62,7 +63,7 @@ argus/backend/util/module_loaders.py,sha256=AcIlX-VRmUQ2THFKT8DLefLSE62Eub2hCxIo
 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=-R-BINTolY06lUQLOLGlsWzza4fBdtLBW-4V3NT64vg,6755
-argus/client/driver_matrix_tests/client.py,sha256=3LIS2hwZ3wVKtQDEMiQGBsIoIcpKi29chheF_yRM704,7800
+argus/client/driver_matrix_tests/client.py,sha256=ekuTkEZbcVqhg6DAC6PvGuC9bXuu4DSOjk96vcLzmuQ,7817
 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
@@ -76,8 +77,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.12.0b1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-argus_alm-0.12.0b1.dist-info/METADATA,sha256=EjbPFZDp6fqyReBEv7ThWlQcmWcLzFdkFFc5ZkE5MyE,6864
-argus_alm-0.12.0b1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-argus_alm-0.12.0b1.dist-info/entry_points.txt,sha256=zEqrAK95P8AAhKbwO4lgrQzKBWqCzHH9zlUPCaCVHoQ,69
-argus_alm-0.12.0b1.dist-info/RECORD,,
+argus_alm-0.12.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+argus_alm-0.12.2.dist-info/METADATA,sha256=RCkJF9S0qfgVoZYNzby251ebAl13rN_5Mzk64Ng_XaQ,6862
+argus_alm-0.12.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+argus_alm-0.12.2.dist-info/entry_points.txt,sha256=zEqrAK95P8AAhKbwO4lgrQzKBWqCzHH9zlUPCaCVHoQ,69
+argus_alm-0.12.2.dist-info/RECORD,,