chore: fix k8s functional tests (#66)

Author: Pasichniuk

src/test/java/com/epam/aidial/deployment/manager/functional/K8sFunctionalTests.java

@@ -16,13 +16,18 @@
  * Pre-requisites:<br>
  * - Kubernetes cluster should have Knative installed & configured<br>
  * - Env variable 'SPRING_PROFILES_ACTIVE' should be set to 'k8s-local'<br>
- * - Env variables 'MCP_PROXY_EXECUTABLE_IMAGE_DEBIAN' & 'MCP_PROXY_EXECUTABLE_IMAGE_ALPINE' should be set<br>
  * - Env variables in 'app.registry' section in application.yaml should be set<br>
+ * - Env variables for mcp-proxy images should be set:<br>
+ *   'MCP_PROXY_EXECUTABLE_IMAGE_DEBIAN', 'MCP_PROXY_EXECUTABLE_IMAGE_ALPINE'<br>
+ * - Env variables for images should be set:<br>
+ *   'K8S_TEST_INTERCEPTOR_IMAGE_URI', 'K8S_TEST_MCP_GIT_SSE_IMAGE_URI', 'K8S_TEST_MCP_GIT_STDIO_IMAGE_URI'<br>
  */
 @EnabledIfEnvironmentVariable(named = "SPRING_PROFILES_ACTIVE", matches = "k8s-local")
 @DataJpaTest
 @TestPropertySource(properties = {
         "datasource.vendor=H2",
+        "app.nim.enabled=false",
+        "app.kserve.enabled=false",
 })
 @ActiveProfiles("k8s-local")
 @Import(K8sLocalConfiguration.class)

src/test/java/com/epam/aidial/deployment/manager/functional/tests/FullWorkflowFunctionalTest.java

@@ -87,6 +87,8 @@ public void shouldSuccessfullyPassFullWorkflow(ImageDefinition imageDefinition,
         // Delete deployment
         deploymentService.deleteDeployment(deployedDeployment.getId());
 
+        waitForDeployment(deployedDeployment.getId(), null, "Deletion timed out");
+
         var maybeDeletedDeployment = deploymentService.getDeployment(deployedDeployment.getId());
         Assertions.assertTrue(maybeDeletedDeployment.isEmpty());
     }
@@ -117,6 +119,9 @@ private void waitForDeployment(String deploymentId, DeploymentStatus expectedSta
         long deployStartTime = System.currentTimeMillis();
         while (true) {
             var maybeDeployment = deploymentService.getDeployment(deploymentId);
+            if (maybeDeployment.isEmpty() && expectedStatus == null) {
+                break;
+            }
             if (maybeDeployment.isPresent() && maybeDeployment.get().getStatus().equals(expectedStatus)) {
                 break;
             }
@@ -130,12 +135,9 @@ private void waitForDeployment(String deploymentId, DeploymentStatus expectedSta
     private static Stream<Arguments> getFullWorkflowParams() {
         var dialUrlEnv = new EnvVarDefinition("DIAL_URL", new SimpleEnvVarValue("http://test-dial-url.svc.cluster.local"),
                 EnvVarMountType.CONTENT, "Sample DIAL URL");
-        var interceptorImageUri = getEnvVarOrDefault("K8S_TEST_INTERCEPTOR_IMAGE_URI",
-                "dialadminartefactslocal.azurecr.io/dial-interceptor-example-1:latest");
-        var mcpGitSseImageGitUrl = getEnvVarOrDefault("K8S_TEST_MCP_GIT_SSE_IMAGE_URI",
-                "https://github.com/siarhei-fedziukovich/PubChem-MCP-Server.git");
-        var mcpGitStdioImageGitUrl = getEnvVarOrDefault("K8S_TEST_MCP_GIT_STDIO_IMAGE_URI",
-                "https://github.com/ekarankow/an-uniprot-mcp");
+        var interceptorImageUri = getEnvVarOrThrow("K8S_TEST_INTERCEPTOR_IMAGE_URI");
+        var mcpGitSseImageGitUrl = getEnvVarOrThrow("K8S_TEST_MCP_GIT_SSE_IMAGE_URI");
+        var mcpGitStdioImageGitUrl = getEnvVarOrThrow("K8S_TEST_MCP_GIT_STDIO_IMAGE_URI");
         return Stream.of(
                 Arguments.of(FunctionalTestHelper.createRealInterceptorImageDefinition(interceptorImageUri),
                         FunctionalTestHelper.createRealInterceptorDeploymentRequest("interceptor-docker-deployment", List.of(dialUrlEnv))),
@@ -148,8 +150,11 @@ private static Stream<Arguments> getFullWorkflowParams() {
         );
     }
 
-    private static String getEnvVarOrDefault(String envVarName, String defaultValue) {
+    private static String getEnvVarOrThrow(String envVarName) {
         String value = System.getenv(envVarName);
-        return StringUtils.isNotEmpty(value) ? value : defaultValue;
+        if (StringUtils.isBlank(value)) {
+            throw new IllegalArgumentException("Environment variable '%s' should be set");
+        }
+        return value;
     }
 }