argus-alm 0.12.0b1__tar.gz → 0.12.2__tar.gz

{argus_alm-0.12.0b1 → argus_alm-0.12.2}/PKG-INFO

@@ -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 → argus_alm-0.12.2}/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_alm-0.12.0b1 → argus_alm-0.12.2}/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_alm-0.12.0b1 → argus_alm-0.12.2}/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_alm-0.12.2/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_alm-0.12.0b1 → argus_alm-0.12.2}/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_alm-0.12.0b1 → argus_alm-0.12.2}/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 → argus_alm-0.12.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "argus-alm"
-version = "0.12.0b1"
+version = "0.12.2"
 description = "Argus"
 authors = ["Alexey Kartashov <alexey.kartashov@scylladb.com>"]
 license = "Apache-2.0"