|
27 | 27 | from utilities.infra import ( |
28 | 28 | create_inference_token, |
29 | 29 | create_isvc_view_role, |
30 | | - get_pods_by_isvc_label, |
| 30 | + wait_for_inference_deployment_replicas, |
31 | 31 | ) |
32 | 32 | from utilities.jira import is_jira_open |
33 | 33 | from utilities.logger import RedactedString |
@@ -95,12 +95,28 @@ def patched_remove_raw_authentication_isvc( |
95 | 95 | } |
96 | 96 | } |
97 | 97 | ): |
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 | | - |
| 98 | + http_s3_ovms_raw_inference_service.wait_for_condition( |
| 99 | + condition=http_s3_ovms_raw_inference_service.Condition.READY, |
| 100 | + status=http_s3_ovms_raw_inference_service.Condition.Status.TRUE, |
| 101 | + timeout=Timeout.TIMEOUT_2MIN, |
| 102 | + ) |
| 103 | + wait_for_inference_deployment_replicas( |
| 104 | + client=unprivileged_client, |
| 105 | + isvc=http_s3_ovms_raw_inference_service, |
| 106 | + ) |
102 | 107 | yield http_s3_ovms_raw_inference_service |
103 | 108 |
|
| 109 | + # ResourceEditor restores auth on exit; wait for ISVC to reconcile before next test |
| 110 | + http_s3_ovms_raw_inference_service.wait_for_condition( |
| 111 | + condition=http_s3_ovms_raw_inference_service.Condition.READY, |
| 112 | + status=http_s3_ovms_raw_inference_service.Condition.Status.TRUE, |
| 113 | + timeout=Timeout.TIMEOUT_2MIN, |
| 114 | + ) |
| 115 | + wait_for_inference_deployment_replicas( |
| 116 | + client=unprivileged_client, |
| 117 | + isvc=http_s3_ovms_raw_inference_service, |
| 118 | + ) |
| 119 | + |
104 | 120 |
|
105 | 121 | @pytest.fixture(scope="class") |
106 | 122 | def model_service_account_2( |
|
0 commit comments