Skip to content

Commit 850de4b

Browse files
mwaykolepre-commit-ci[bot]
mwaykole
and
pre-commit-ci[bot]
authored
Remove jira ref form code (#1293)
* Remove jira ref form code Signed-off-by: Milind waykole <mwaykole@redhat.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Remove jira ref form code Signed-off-by: Milind waykole <mwaykole@redhat.com> * Remove jira ref form code Signed-off-by: Milind waykole <mwaykole@redhat.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Milind waykole <mwaykole@redhat.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent a84ef19 commit 850de4b

File tree

5 files changed

+18
-58
lines changed

5 files changed

+18
-58
lines changed

‎tests/model_serving/model_server/kserve/authentication/conftest.py‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,16 @@
2121
ModelName,
2222
Protocols,
2323
RuntimeTemplates,
24+
Timeout,
2425
)
2526
from utilities.inference_utils import create_isvc
2627
from utilities.infra import (
2728
create_inference_token,
2829
create_isvc_view_role,
29-
get_pods_by_isvc_label,
3030
)
31-
from utilities.jira import is_jira_open
3231
from utilities.logger import RedactedString
33-
from utilities.opendatahub_logger import get_logger
3432
from utilities.serving_runtime import ServingRuntimeFromTemplate
3533

36-
LOGGER = get_logger(name=__name__)
37-
3834

3935
# HTTP/REST model serving
4036
@pytest.fixture(scope="class")
@@ -77,15 +73,9 @@ def http_raw_inference_token(model_service_account: ServiceAccount, http_raw_rol
7773

7874
@pytest.fixture()
7975
def patched_remove_raw_authentication_isvc(
80-
admin_client: DynamicClient,
8176
unprivileged_client: DynamicClient,
8277
http_s3_ovms_raw_inference_service: InferenceService,
8378
) -> Generator[InferenceService, Any, Any]:
84-
predictor_pod = get_pods_by_isvc_label(
85-
client=unprivileged_client,
86-
isvc=http_s3_ovms_raw_inference_service,
87-
)[0]
88-
8979
with ResourceEditor(
9080
patches={
9181
http_s3_ovms_raw_inference_service: {
@@ -95,12 +85,20 @@ def patched_remove_raw_authentication_isvc(
9585
}
9686
}
9787
):
98-
if is_jira_open(jira_id="RHOAIENG-52129", admin_client=admin_client):
99-
LOGGER.info("RHOAIENG-52129 is open; waiting for predictor pod rollout after auth toggle")
100-
predictor_pod.wait_deleted()
101-
88+
http_s3_ovms_raw_inference_service.wait_for_condition(
89+
condition=http_s3_ovms_raw_inference_service.Condition.READY,
90+
status=http_s3_ovms_raw_inference_service.Condition.Status.TRUE,
91+
timeout=Timeout.TIMEOUT_2MIN,
92+
)
10293
yield http_s3_ovms_raw_inference_service
10394

95+
# ResourceEditor restores auth on exit; wait for ISVC to reconcile before next test
96+
http_s3_ovms_raw_inference_service.wait_for_condition(
97+
condition=http_s3_ovms_raw_inference_service.Condition.READY,
98+
status=http_s3_ovms_raw_inference_service.Condition.Status.TRUE,
99+
timeout=Timeout.TIMEOUT_2MIN,
100+
)
101+
104102

105103
@pytest.fixture(scope="class")
106104
def model_service_account_2(

‎tests/model_serving/model_server/kserve/authentication/test_kserve_token_authentication_raw.py‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import pytest
2-
from ocp_resources.resource import ResourceEditor
32

43
from tests.model_serving.model_server.utils import verify_inference_response
5-
from utilities.constants import Annotations, Protocols
4+
from utilities.constants import Protocols
65
from utilities.inference_utils import Inference
7-
from utilities.infra import check_pod_status_in_time, get_pods_by_isvc_label
8-
from utilities.jira import is_jira_issue_open
96
from utilities.manifests.onnx import ONNX_INFERENCE_CONFIG
107

118
pytestmark = pytest.mark.usefixtures("valid_aws_config")
@@ -49,40 +46,6 @@ def test_disabled_raw_model_authentication(self, patched_remove_raw_authenticati
4946
use_default_query=True,
5047
)
5148

52-
@pytest.mark.smoke
53-
@pytest.mark.xfail(condition=is_jira_issue_open(jira_id="RHOAIENG-52129"), reason="RHOAIENG-52129", run=False)
54-
def test_raw_disable_enable_authentication_no_pod_rollout(self, http_s3_ovms_raw_inference_service):
55-
"""Verify no pod rollout when disabling and enabling authentication"""
56-
pod = get_pods_by_isvc_label(
57-
client=http_s3_ovms_raw_inference_service.client,
58-
isvc=http_s3_ovms_raw_inference_service,
59-
)[0]
60-
61-
ResourceEditor(
62-
patches={
63-
http_s3_ovms_raw_inference_service: {
64-
"metadata": {
65-
"annotations": {Annotations.KserveAuth.SECURITY: "false"},
66-
}
67-
}
68-
}
69-
).update()
70-
71-
check_pod_status_in_time(pod=pod, status={pod.Status.RUNNING})
72-
73-
ResourceEditor(
74-
patches={
75-
http_s3_ovms_raw_inference_service: {
76-
"metadata": {
77-
"annotations": {Annotations.KserveAuth.SECURITY: "true"},
78-
}
79-
}
80-
}
81-
).update()
82-
83-
check_pod_status_in_time(pod=pod, status={pod.Status.RUNNING})
84-
85-
@pytest.mark.dependency(depends=["test_disabled_raw_model_authentication"])
8649
def test_re_enabled_raw_model_authentication(self, http_s3_ovms_raw_inference_service, http_raw_inference_token):
8750
"""Verify model query after authentication is re-enabled"""
8851
verify_inference_response(

‎tests/model_serving/model_server/kserve/storage/oci/test_oci_image.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def test_model_car_no_restarts(self, model_car_inference_service):
5555

5656
@pytest.mark.tier1
5757
@pytest.mark.ocp_interop
58-
@pytest.mark.skip(reason="Skipping due to RHOAIENG-12306")
5958
def test_model_car_using_rest(self, model_car_inference_service):
6059
"""Verify model query with token using REST"""
6160
verify_inference_response(
@@ -68,7 +67,6 @@ def test_model_car_using_rest(self, model_car_inference_service):
6867

6968
@pytest.mark.tier1
7069
@pytest.mark.ocp_interop
71-
@pytest.mark.skip(reason="Skipping due to RHOAIENG-38674")
7270
def test_model_status_loaded(self, model_car_inference_service):
7371
"""Verify model status on the InferenceService resource is in a valid state."""
7472
model_status = model_car_inference_service.instance.status.modelStatus

‎utilities/infra.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,9 @@ def verify_no_failed_pods(
802802
return
803803

804804

805-
def check_pod_status_in_time(pod: Pod, status: set[str], duration: int = Timeout.TIMEOUT_2MIN, wait: int = 1) -> None:
805+
def check_pod_status_in_time(
806+
pod: Pod, status: set[str], duration: int = Timeout.TIMEOUT_2MIN, wait: int = 1
807+
) -> None: # skip-unused-code
806808
"""
807809
Checks if a pod status is maintained for a given duration. If not, an AssertionError is raised.
808810

‎utilities/jira.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def get_jira_issue_fields(jira_id: str) -> Any:
4848
return get_jira_connection().issue(id=jira_id, fields="status, fixVersions").fields
4949

5050

51-
def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
51+
def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool: # skip-unused-code
5252
"""
5353
Check if Jira issue is open.
5454
@@ -65,7 +65,6 @@ def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
6565

6666
else:
6767
jira_fields = get_jira_issue_fields(jira_id=jira_id)
68-
# Check if the operator version in ClusterServiceVersion is greater than the jira fix version
6968
jira_fix_versions: list[Version] = [
7069
Version(_fix_version.group())
7170
for fix_version in jira_fields.fixVersions

0 commit comments

Comments
 (0)