|
34 | 34 | } |
35 | 35 |
|
36 | 36 | _mock_tls_cluster_deploy_state: dict[str, bool] = {"done": False} |
37 | | -_tls_llama_warm_in_prow: dict[str, bool] = {"done": False} |
38 | 37 |
|
39 | 38 |
|
40 | 39 | def reset_tls_prow_restart_optimization_state() -> None: |
41 | | - """Reset per-feature Prow restart optimizations (call from ``before_feature``).""" |
42 | | - _tls_llama_warm_in_prow["done"] = False |
| 40 | + """Reset per-feature Prow state (call from ``before_feature``).""" |
| 41 | + _mock_tls_cluster_deploy_state["done"] = False |
43 | 42 | os.environ.pop("E2E_LLAMA_RELOAD_CONFIG_ONLY", None) |
| 43 | + os.environ.pop("E2E_COPY_MOCK_TLS_CERTS_TO_LLAMA", None) |
44 | 44 |
|
45 | 45 |
|
46 | 46 | def _prepare_tls_prow_llama_restart_env() -> None: |
47 | | - """Set env vars so e2e-ops can reload run.yaml instead of recreating the pod.""" |
| 47 | + """Set env vars so e2e-ops always recreates the llama pod (no config-only reload). |
| 48 | +
|
| 49 | + TLS scenarios change run.yaml and rely on /certs volume mounts; full pod |
| 50 | + restarts are slower but more reliable than ``kill 1`` reload on Konflux. |
| 51 | + """ |
48 | 52 | os.environ["E2E_COPY_MOCK_TLS_CERTS_TO_LLAMA"] = "1" |
49 | | - if _tls_llama_warm_in_prow["done"]: |
50 | | - os.environ["E2E_LLAMA_RELOAD_CONFIG_ONLY"] = "1" |
51 | | - else: |
52 | | - os.environ.pop("E2E_LLAMA_RELOAD_CONFIG_ONLY", None) |
| 53 | + os.environ.pop("E2E_LLAMA_RELOAD_CONFIG_ONLY", None) |
53 | 54 |
|
54 | 55 |
|
55 | 56 | def _cluster_mock_tls_inference_host() -> str: |
@@ -156,8 +157,6 @@ def _configure_tls(tls_config: dict[str, Any], base_url: Optional[str] = None) - |
156 | 157 | write_llama_config(config) |
157 | 158 | if is_prow_environment(): |
158 | 159 | _prepare_tls_prow_llama_restart_env() |
159 | | - if not _tls_llama_warm_in_prow["done"]: |
160 | | - _tls_llama_warm_in_prow["done"] = True |
161 | 160 |
|
162 | 161 |
|
163 | 162 | # --- Background Steps --- |
|
0 commit comments