Skip to content

Commit 46c50a4

Browse files
Raghul-Mpre-commit-ci[bot]dbasunag
authored
QG refator smoke (Model Runtimes) (#1217)
* QG refator smoke (model Runtimes) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Changed makers to avoid duplication * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fixed imagevaliadtion marker * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * pre commit fix * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Remove smoke marker from OVMS smoke test Removed smoke test marker from the test function. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Debarati Basu-Nag <dbasunag@redhat.com>
1 parent 785168e commit 46c50a4

11 files changed

Lines changed: 23 additions & 14 deletions

File tree

‎tests/model_serving/model_runtime/image_validation/test_verify_serving_runtime_images.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020

2121
LOGGER = get_logger(name=__name__)
2222

23-
pytestmark = [
24-
pytest.mark.downstream_only,
25-
pytest.mark.skip_must_gather,
26-
pytest.mark.smoke,
27-
]
23+
pytestmark = [pytest.mark.downstream_only, pytest.mark.skip_must_gather, pytest.mark.smoke]
2824

2925

3026
@pytest.mark.parametrize("serving_runtime_pods_for_runtime", RUNTIME_CONFIGS, indirect=True)

‎tests/model_serving/model_runtime/mlserver/basic_model_deployment/test_mlserver_basic_model_deployment.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
pytestmark = pytest.mark.usefixtures("valid_aws_config")
2828

2929

30-
@pytest.mark.smoke
3130
@pytest.mark.parametrize(
3231
(
3332
"model_namespace",
@@ -50,6 +49,7 @@
5049
model_format_name=ModelFormat.LIGHTGBM,
5150
deployment_type=RAW_DEPLOYMENT_TYPE,
5251
),
52+
marks=pytest.mark.tier1,
5353
),
5454
pytest.param(
5555
get_model_namespace_dict(
@@ -64,6 +64,7 @@
6464
model_format_name=ModelFormat.ONNX,
6565
deployment_type=RAW_DEPLOYMENT_TYPE,
6666
),
67+
marks=pytest.mark.tier1,
6768
),
6869
pytest.param(
6970
get_model_namespace_dict(
@@ -78,6 +79,7 @@
7879
model_format_name=ModelFormat.SKLEARN,
7980
deployment_type=RAW_DEPLOYMENT_TYPE,
8081
),
82+
marks=pytest.mark.smoke,
8183
),
8284
pytest.param(
8385
get_model_namespace_dict(
@@ -92,6 +94,7 @@
9294
model_format_name=ModelFormat.XGBOOST,
9395
deployment_type=RAW_DEPLOYMENT_TYPE,
9496
),
97+
marks=pytest.mark.tier1,
9598
),
9699
],
97100
indirect=[

‎tests/model_serving/model_runtime/openvino/test_ovms_model_deployment.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
pytestmark = pytest.mark.usefixtures("valid_aws_config")
3333

3434

35-
@pytest.mark.smoke
3635
@pytest.mark.parametrize(
3736
(
3837
"protocol",
@@ -59,6 +58,7 @@
5958
deployment_type=RAW_DEPLOYMENT_TYPE,
6059
protocol_type=Protocols.REST,
6160
),
61+
marks=pytest.mark.smoke,
6262
),
6363
pytest.param(
6464
REST_PROTOCOL_TYPE_DICT,
@@ -76,6 +76,7 @@
7676
deployment_type=RAW_DEPLOYMENT_TYPE,
7777
protocol_type=Protocols.REST,
7878
),
79+
marks=pytest.mark.tier1,
7980
),
8081
pytest.param(
8182
REST_PROTOCOL_TYPE_DICT,
@@ -93,6 +94,7 @@
9394
deployment_type=RAW_DEPLOYMENT_TYPE,
9495
protocol_type=Protocols.REST,
9596
),
97+
marks=pytest.mark.tier1,
9698
),
9799
],
98100
indirect=[

‎tests/model_serving/model_runtime/openvino/test_ovms_smoke.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
from ocp_resources.pod import Pod
2020

2121

22-
@pytest.mark.smoke
2322
@pytest.mark.parametrize(
2423
"model_namespace",
25-
[pytest.param({"name": "ovms-smoke"}, id="ovms-smoke")],
24+
[pytest.param({"name": "ovms-smoke"}, id="ovms-smoke", marks=pytest.mark.smoke)],
2625
indirect=["model_namespace"],
2726
)
2827
class TestOVMSSmokeInOpenShift:

‎tests/model_serving/model_runtime/triton/basic_model_deployment/test_dali_model.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
)
3131

3232

33-
@pytest.mark.gpu
3433
@pytest.mark.parametrize(
3534
("protocol", "model_namespace", "s3_models_storage_uri", "triton_serving_runtime", "triton_inference_service"),
3635
[
@@ -44,6 +43,7 @@
4443
**BASE_RAW_DEPLOYMENT_CONFIG,
4544
},
4645
id="dali-raw-rest-deployment",
46+
marks=[pytest.mark.tier1, pytest.mark.gpu],
4747
),
4848
pytest.param(
4949
{"protocol_type": Protocols.GRPC},
@@ -55,6 +55,7 @@
5555
**BASE_RAW_DEPLOYMENT_CONFIG,
5656
},
5757
id="dali-raw-grpc-deployment",
58+
marks=[pytest.mark.tier1, pytest.mark.gpu],
5859
),
5960
],
6061
indirect=True,

‎tests/model_serving/model_runtime/triton/basic_model_deployment/test_fil_model.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
**BASE_RAW_DEPLOYMENT_CONFIG,
4444
},
4545
id="fil-raw-rest-deployment",
46+
marks=pytest.mark.tier1,
4647
),
4748
pytest.param(
4849
{"protocol_type": Protocols.GRPC},
@@ -54,6 +55,7 @@
5455
**BASE_RAW_DEPLOYMENT_CONFIG,
5556
},
5657
id="fil-raw-grpc-deployment",
58+
marks=pytest.mark.tier1,
5759
),
5860
],
5961
indirect=True,

‎tests/model_serving/model_runtime/triton/basic_model_deployment/test_keras_model.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
)
3232

3333

34-
@pytest.mark.smoke
3534
@pytest.mark.parametrize(
3635
("protocol", "model_namespace", "s3_models_storage_uri", "triton_serving_runtime", "triton_inference_service"),
3736
[
@@ -45,6 +44,7 @@
4544
**BASE_RAW_DEPLOYMENT_CONFIG,
4645
},
4746
id="keras-raw-rest-deployment",
47+
marks=pytest.mark.tier1,
4848
),
4949
pytest.param(
5050
{"protocol_type": Protocols.GRPC},
@@ -56,6 +56,7 @@
5656
**BASE_RAW_DEPLOYMENT_CONFIG,
5757
},
5858
id="keras-raw-grpc-deployment",
59+
marks=pytest.mark.tier1,
5960
),
6061
],
6162
indirect=True,

‎tests/model_serving/model_runtime/triton/basic_model_deployment/test_onnx_model.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
)
3232

3333

34-
@pytest.mark.sanity
3534
@pytest.mark.parametrize(
3635
("protocol", "model_namespace", "s3_models_storage_uri", "triton_serving_runtime", "triton_inference_service"),
3736
[
@@ -45,6 +44,7 @@
4544
**BASE_RAW_DEPLOYMENT_CONFIG,
4645
},
4746
id="densenetonnx-raw-rest-deployment",
47+
marks=pytest.mark.tier1,
4848
),
4949
pytest.param(
5050
{"protocol_type": Protocols.GRPC},
@@ -56,6 +56,7 @@
5656
**BASE_RAW_DEPLOYMENT_CONFIG,
5757
},
5858
id="densenetonnx-raw-grpc-deployment",
59+
marks=pytest.mark.tier1,
5960
),
6061
],
6162
indirect=True,

‎tests/model_serving/model_runtime/triton/basic_model_deployment/test_python_model.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
**BASE_RAW_DEPLOYMENT_CONFIG,
4545
},
4646
id="python-raw-rest-deployment",
47+
marks=pytest.mark.tier1,
4748
),
4849
pytest.param(
4950
{"protocol_type": Protocols.GRPC},
@@ -55,6 +56,7 @@
5556
**BASE_RAW_DEPLOYMENT_CONFIG,
5657
},
5758
id="python-raw-grpc-deployment",
59+
marks=pytest.mark.tier1,
5860
),
5961
],
6062
indirect=True,

‎tests/model_serving/model_runtime/triton/basic_model_deployment/test_pytorch_model.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
)
3232

3333

34-
@pytest.mark.sanity
3534
@pytest.mark.parametrize(
3635
("protocol", "model_namespace", "s3_models_storage_uri", "triton_serving_runtime", "triton_inference_service"),
3736
[
@@ -45,6 +44,7 @@
4544
**BASE_RAW_DEPLOYMENT_CONFIG,
4645
},
4746
id="pytorch-raw-rest-deployment",
47+
marks=pytest.mark.tier1,
4848
),
4949
pytest.param(
5050
{"protocol_type": Protocols.GRPC},
@@ -56,6 +56,7 @@
5656
**BASE_RAW_DEPLOYMENT_CONFIG,
5757
},
5858
id="pytorch-raw-grpc-deployment",
59+
marks=pytest.mark.tier1,
5960
),
6061
],
6162
indirect=True,

0 commit comments

Comments
 (0)