diff --git a/artifacts_test.py b/artifacts_test.py index d964bdd9c6a..316c3ac96a6 100644 --- a/artifacts_test.py +++ b/artifacts_test.py @@ -16,6 +16,7 @@ import typing from functools import cached_property import json +from unittest import SkipTest import yaml import requests @@ -324,6 +325,49 @@ def test_scylla_service(self): with self.subTest("check ENA support"): assert self.node.ena_support, "ENA support is not enabled" +<<<<<<< HEAD +||||||| parent of 11409ec1a (fix(artifacts_test): Skip IOTuneValidator on unsupported instances) + if backend in ["gce", "aws", "azure"] and self.params.get("use_preinstalled_scylla"): + with self.subTest("check Scylla IO Params"): + try: + validator = IOTuneValidator(self.node) + validator.validate() + send_iotune_results_to_argus( + self.test_config.argus_client(), + validator.results, + self.node, + self.params + ) + except Exception: # pylint: disable=broad-except # noqa: BLE001 + self.log.error("IOTuneValidator failed", exc_info=True) + TestFrameworkEvent(source={self.__class__.__name__}, + message="Error during IOTune params validation.", + severity=Severity.ERROR).publish() + +======= + if backend in ["gce", "aws", "azure"] and self.params.get("use_preinstalled_scylla"): + with self.subTest("check Scylla IO Params"): + try: + if self.node.db_node_instance_type in ["t3.micro"]: + self.skipTest( + f"{self.node.db_node_instance_type} is not a supported instance - skipping this test.") + validator = IOTuneValidator(self.node) + validator.validate() + send_iotune_results_to_argus( + self.test_config.argus_client(), + validator.results, + self.node, + self.params + ) + except SkipTest as exc: + self.log.info("Skipping IOTuneValidation due to %s", exc.args) + except Exception: # pylint: disable=broad-except # noqa: BLE001 + self.log.error("IOTuneValidator failed", exc_info=True) + TestFrameworkEvent(source={self.__class__.__name__}, + message="Error during IOTune params validation.", + severity=Severity.ERROR).publish() + +>>>>>>> 11409ec1a (fix(artifacts_test): Skip IOTuneValidator on unsupported instances) with self.subTest("verify write cache for NVMe devices"): self.verify_nvme_write_cache()