argus-alm 0.15.3__py3-none-any.whl → 0.15.5__py3-none-any.whl

argus/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.15.3'
-__version_tuple__ = version_tuple = (0, 15, 3)
+__version__ = version = '0.15.5'
+__version_tuple__ = version_tuple = (0, 15, 5)

argus/client/base.py

@@ -96,14 +96,17 @@ class ArgusClient:
         }
 
     def get(self, endpoint: str, location_params: dict[str, str] = None, params: dict = None) -> requests.Response:
+        url = self.get_url_for_endpoint(
+            endpoint=endpoint,
+            location_params=location_params
+        )
+        LOGGER.debug("GET Request: %s, params: %s", url, params)
         response = requests.get(
-            url=self.get_url_for_endpoint(
-                endpoint=endpoint,
-                location_params=location_params
-            ),
+            url=url,
             params=params,
             headers=self.request_headers
         )
+        LOGGER.debug("GET Response: %s %s", response.status_code, response.url)
 
         return response
 
@@ -114,15 +117,18 @@ class ArgusClient:
         params: dict = None,
         body: dict = None,
     ) -> requests.Response:
+        url = self.get_url_for_endpoint(
+            endpoint=endpoint,
+            location_params=location_params
+        )
+        LOGGER.debug("POST Request: %s, params: %s, body: %s", url, params, body)
         response = requests.post(
-            url=self.get_url_for_endpoint(
-                endpoint=endpoint,
-                location_params=location_params
-            ),
+            url=url,
             params=params,
             json=body,
             headers=self.request_headers,
         )
+        LOGGER.debug("POST Response: %s %s", response.status_code, response.url)
 
         return response
 

argus/client/generic/cli.py

@@ -32,13 +32,14 @@ def cli():
 @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("--sub-type", required=False, help="Sub-type of the generic test: pytest, dtest")
 @click.option("--scylla-version", required=False, default=None, help="Version of Scylla used for this job")
 @click.option("--extra-headers", default={}, type=click.UNPROCESSED, callback=validate_extra_headers, help="extra headers to pass to argus, should be in json format", envvar='ARGUS_EXTRA_HEADERS')
-def submit_run(api_key: str, base_url: str, id: str, build_id: str, build_url: str, started_by: str, scylla_version: str = None, extra_headers: dict | None = None):
+def submit_run(api_key: str, base_url: str, id: str, build_id: str, build_url: str, started_by: str, sub_type: str = None, scylla_version: str = None, extra_headers: dict | None = None):
     LOGGER.info("Submitting %s (%s) to Argus...", build_id, id)
     client = ArgusGenericClient(auth_token=api_key, base_url=base_url, extra_headers=extra_headers)
     client.submit_generic_run(build_id=build_id, run_id=id, started_by=started_by,
-                              build_url=build_url, scylla_version=scylla_version)
+                              build_url=build_url, scylla_version=scylla_version, sub_type=sub_type)
     LOGGER.info("Done.")
 
 

argus/client/generic/client.py

@@ -15,12 +15,13 @@ class ArgusGenericClient(ArgusClient):
     def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
         super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
 
-    def submit_generic_run(self, build_id: str, run_id: str, started_by: str, build_url: str, scylla_version: str | None = None):
+    def submit_generic_run(self, build_id: str, run_id: str, started_by: str, build_url: str, sub_type: str = None, scylla_version: str | None = None):
         request_body = {
             "build_id": build_id,
             "run_id": run_id,
             "started_by": started_by,
             "build_url": build_url,
+            "sub_type": sub_type,
             "scylla_version": scylla_version
         }
 

argus/client/sct/client.py

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

argus/common/enums.py

@@ -22,6 +22,22 @@ class TestStatus(str, Enum):
     NOT_RUN = "not_run"
 
 
+class PytestStatus(str, Enum):
+    ERROR = "error"
+    PASSED = "passed"
+    FAILURE = "failure"
+    SKIPPED = "skipped"
+    XFAILED = "xfailed"
+    XPASS = "xpass"
+    # Following statuses reflect test & teardown state
+    # Example: passed & error means the test passed
+    # but the tearDown stage errored
+    PASSED_ERROR = "passed & error"
+    FAILURE_ERROR = "failure & error"
+    SKIPPED_ERROR = "skipped & error"
+    ERROR_ERROR = "error & error"
+
+
 class TestInvestigationStatus(str, Enum):
     NOT_INVESTIGATED = "not_investigated"
     IN_PROGRESS = "in_progress"

{argus_alm-0.15.3.dist-info → argus_alm-0.15.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-alm
-Version: 0.15.3
+Version: 0.15.5
 Summary: Argus
 Author-email: Alexey Kartashov <alexey.kartashov@scylladb.com>, Łukasz Sójka <lukasz.sojka@scylladb.com>
 License-Expression: Apache-2.0
@@ -13,16 +13,16 @@ Requires-Dist: requests>=2.26.0
 Requires-Dist: click>=8.1.3
 Provides-Extra: web-backend
 Requires-Dist: PyYAML~=6.0.0; extra == "web-backend"
-Requires-Dist: scylla-driver~=3.26.8; extra == "web-backend"
+Requires-Dist: scylla-driver>=3.26.8; extra == "web-backend"
 Requires-Dist: Flask~=3.0.0; extra == "web-backend"
 Requires-Dist: Flask-WTF~=1.0.0; extra == "web-backend"
 Requires-Dist: Flask-Login~=0.5.0; extra == "web-backend"
 Requires-Dist: humanize~=3.13.1; extra == "web-backend"
 Requires-Dist: python-magic~=0.4.24; extra == "web-backend"
 Requires-Dist: uwsgi~=2.0.20; extra == "web-backend"
-Requires-Dist: python-jenkins~=1.7.0; extra == "web-backend"
+Requires-Dist: python-jenkins>=1.7.0; extra == "web-backend"
 Requires-Dist: python-slugify~=6.1.1; extra == "web-backend"
-Requires-Dist: pygithub~=2.6.1; extra == "web-backend"
+Requires-Dist: pygithub>=2.6.1; extra == "web-backend"
 Requires-Dist: boto3~=1.38.9; extra == "web-backend"
 Provides-Extra: docker-image
 Requires-Dist: supervisor~=4.2.4; extra == "docker-image"

{argus_alm-0.15.3.dist-info → argus_alm-0.15.5.dist-info}/RECORD

@@ -1,22 +1,22 @@
 argus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/_version.py,sha256=PbirELW_mdGsRZ5YJl3tATepVxI3ZSPTmrkO5T21Xtw,513
+argus/_version.py,sha256=jQuZKhl-YcplxyXgfpbbOOVRFLWdzyF8mpyWtCtN7BI,513
 argus/client/__init__.py,sha256=bO9_j5_jK5kvTHR46KEZ0Y-p0li7CBW8QSd-K5Ez4vA,42
-argus/client/base.py,sha256=QlJDC-E6OXf33FtPagOuH1wWsTd9NEBJO2lBUL5eAqE,8143
+argus/client/base.py,sha256=XwqshXFkb6h_QJH3wlFmWjSYV3p66y7B2lufShSkWAs,8463
 argus/client/generic_result.py,sha256=9D0zrpfEDiIL7PjL12TZnqk5Mi_1T1UvesF5wWeMfz0,6264
 argus/client/driver_matrix_tests/cli.py,sha256=JpI0v1hzRQr9KkrxO7D4hEbkzumexFFC_iRM8558zHU,8375
 argus/client/driver_matrix_tests/client.py,sha256=fFucqwog6WnDnje1xB-4ERfwHXblXP4upmtt9RtOkls,2806
-argus/client/generic/cli.py,sha256=0mTTjbeB0iDiR5kKim9JYu_0PetCHiJUf8VYvdvmLHo,4570
-argus/client/generic/client.py,sha256=D9j2047guXO0SgkcWQSftuntvj3LtTSAxBMBr4-4v58,1915
-argus/client/sct/client.py,sha256=q5W0RL1BhA6Foc9rA10jLsnQ7MNGWgjbmy3_E0ePjeI,11436
+argus/client/generic/cli.py,sha256=jsdSwzwzefX1POyrZ4lFTRcjWPmTauuXBGjceM54Zk4,4707
+argus/client/generic/client.py,sha256=3MONtLIcF7rZ5x5OaAQKi4YGHCHb3-9ooCUhWtKs4C4,1971
+argus/client/sct/client.py,sha256=SWFPg2pe8m5mg5bERrqFbCPZeFWbc7tgmrHIHhxHMvo,11512
 argus/client/sct/types.py,sha256=VLgVe7qPmJtCLqtPnuX8N8kMKZq-iY3SKz68nvU6nJ4,371
 argus/client/sirenada/client.py,sha256=lzhmBFAUnvPSAJfCjeQ0L5nbp50Q0YLHwIondO9rvt4,6321
 argus/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/common/enums.py,sha256=EhTQrgedlEz5sDYJ1gFnE2eC2nc1neQCRgzOgssQvWY,749
+argus/common/enums.py,sha256=2ASF_NMUU_inJCHnrjkvZ1jXWL2zAWzVgmtjCUwSUjA,1206
 argus/common/sct_types.py,sha256=csRkFdYkjLw1qaJhikW2NKvzdA1DQ1a93nwtKUB1gRs,1329
 argus/common/sirenada_types.py,sha256=CZH2JXA1KYUj29eXYe8rIAAWdN1XPqOsDPAXvM25bVQ,698
-argus_alm-0.15.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-argus_alm-0.15.3.dist-info/METADATA,sha256=GMIcQjxIfBHn3EBlD8JAJGMGz7HPYsiWIaD8YltMGZg,4860
-argus_alm-0.15.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-argus_alm-0.15.3.dist-info/entry_points.txt,sha256=5mSBLLPndhFHKY5M9SCF8WhDBAArrj-S2IL-uoiaJiE,140
-argus_alm-0.15.3.dist-info/top_level.txt,sha256=Pea173vTU-Et8xmNCctS34REW4cH0Xmjyiztu0HuM0c,6
-argus_alm-0.15.3.dist-info/RECORD,,
+argus_alm-0.15.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+argus_alm-0.15.5.dist-info/METADATA,sha256=A3F6vz5jCyU4mZlAA8qs92PbcMFqfeyKqTwZZPqKnrY,4860
+argus_alm-0.15.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+argus_alm-0.15.5.dist-info/entry_points.txt,sha256=5mSBLLPndhFHKY5M9SCF8WhDBAArrj-S2IL-uoiaJiE,140
+argus_alm-0.15.5.dist-info/top_level.txt,sha256=Pea173vTU-Et8xmNCctS34REW4cH0Xmjyiztu0HuM0c,6
+argus_alm-0.15.5.dist-info/RECORD,,