Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,10 @@
from utilities.infra import (
create_inference_token,
create_isvc_view_role,
get_pods_by_isvc_label,
)
from utilities.jira import is_jira_open
from utilities.logger import RedactedString
from utilities.opendatahub_logger import get_logger
from utilities.serving_runtime import ServingRuntimeFromTemplate

LOGGER = get_logger(name=__name__)


# HTTP/REST model serving
@pytest.fixture(scope="class")
Expand Down Expand Up @@ -77,15 +72,9 @@ def http_raw_inference_token(model_service_account: ServiceAccount, http_raw_rol

@pytest.fixture()
def patched_remove_raw_authentication_isvc(
admin_client: DynamicClient,
unprivileged_client: DynamicClient,
http_s3_ovms_raw_inference_service: InferenceService,
) -> Generator[InferenceService, Any, Any]:
predictor_pod = get_pods_by_isvc_label(
client=unprivileged_client,
isvc=http_s3_ovms_raw_inference_service,
)[0]

with ResourceEditor(
patches={
http_s3_ovms_raw_inference_service: {
Expand All @@ -95,10 +84,6 @@ def patched_remove_raw_authentication_isvc(
}
}
):
if is_jira_open(jira_id="RHOAIENG-52129", admin_client=admin_client):
LOGGER.info("RHOAIENG-52129 is open; waiting for predictor pod rollout after auth toggle")
predictor_pod.wait_deleted()

yield http_s3_ovms_raw_inference_service


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from utilities.constants import Annotations, Protocols
from utilities.inference_utils import Inference
from utilities.infra import check_pod_status_in_time, get_pods_by_isvc_label
from utilities.jira import is_jira_issue_open
from utilities.manifests.onnx import ONNX_INFERENCE_CONFIG

pytestmark = pytest.mark.usefixtures("valid_aws_config")
Expand Down Expand Up @@ -50,7 +49,6 @@ def test_disabled_raw_model_authentication(self, patched_remove_raw_authenticati
)

@pytest.mark.smoke
@pytest.mark.xfail(condition=is_jira_issue_open(jira_id="RHOAIENG-52129"), reason="RHOAIENG-52129", run=False)
def test_raw_disable_enable_authentication_no_pod_rollout(self, http_s3_ovms_raw_inference_service):
"""Verify no pod rollout when disabling and enabling authentication"""
pod = get_pods_by_isvc_label(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ def test_model_car_no_restarts(self, model_car_inference_service):

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

@pytest.mark.tier1
@pytest.mark.ocp_interop
@pytest.mark.skip(reason="Skipping due to RHOAIENG-38674")
def test_model_status_loaded(self, model_car_inference_service):
"""Verify model status on the InferenceService resource is in a valid state."""
model_status = model_car_inference_service.instance.status.modelStatus
Expand Down
3 changes: 1 addition & 2 deletions utilities/jira.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def get_jira_issue_fields(jira_id: str) -> Any:
return get_jira_connection().issue(id=jira_id, fields="status, fixVersions").fields


def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool: # skip-unused-code
"""
Check if Jira issue is open.

Expand All @@ -65,7 +65,6 @@ def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:

else:
jira_fields = get_jira_issue_fields(jira_id=jira_id)
# Check if the operator version in ClusterServiceVersion is greater than the jira fix version
jira_fix_versions: list[Version] = [
Version(_fix_version.group())
for fix_version in jira_fields.fixVersions
Expand Down