Address comments

Author: nananosirova

packages/cypress/cypress/pages/pipelines/pipelinesGlobal.ts

@@ -48,7 +48,7 @@ class PipelinesGlobal {
     cy.findByRole('menuitem', { name }).click();
   }
 
-  findImportPipelineButton(timeout = 60000) {
+  findImportPipelineButton(timeout?: number) {
     return cy.findByTestId('import-pipeline-button', { timeout });
   }
 

packages/cypress/cypress/pages/pipelines/pipelinesTable.ts

@@ -168,7 +168,7 @@ class PipelinesTable {
     return cy.findByTestId(this.testId);
   }
 
-  findPipelineLinkByName(name: string, timeout = 60000) {
+  findPipelineLinkByName(name: string, timeout?: number) {
     return this.find().contains('a', name, { timeout });
   }
 

packages/cypress/cypress/pages/projects.ts

@@ -244,7 +244,7 @@ class ProjectDetails {
     return cy.findByTestId('delete-project-action');
   }
 
-  findImportPipelineButton(timeout = 60000) {
+  findImportPipelineButton(timeout?: number) {
     return cy.findByTestId('import-pipeline-button', { timeout });
   }
 

packages/cypress/cypress/tests/e2e/pipelines/testPipelineMLflowIntegration.cy.ts

@@ -10,7 +10,7 @@ import {
 import { provisionProjectForPipelines } from '../../../utils/pipelines';
 import { waitForDspaReady } from '../../../utils/oc_commands/dspa';
 import { getIrisPipelinePath } from '../../../utils/fileImportUtils';
-import { createOpenShiftConfigMap } from '../../../utils/oc_commands/configmap';
+import { createDsPipelineCustomEnvVarsConfigMap } from '../../../utils/oc_commands/configmap';
 import {
   disableMlflowFeatures,
   enableMlflowFeatures,
@@ -38,6 +38,8 @@ const awsBucket = 'BUCKET_2' as const;
 const tags = ['@Pipelines', '@MLflow', '@Dashboard', '@NonConcurrent'] as const;
 
 const BASE_RUN_TIMEOUT_MS = 240000;
+const DSPA_READY_TIMEOUT_MS = 600000;
+const DSPA_POD_TIMEOUT_MS = 310000;
 
 describe(
   'An admin user can configure MLflow experiment tracking for a pipeline server',
@@ -59,17 +61,10 @@ describe(
             integrationMode: 'AUTODETECT',
             pipelineStore: 'kubernetes',
           });
-          createOpenShiftConfigMap(
-            'ds-pipeline-custom-env-vars',
-            projectName,
-            Object.fromEntries([
-              ['pip_index_url', Cypress.env('PIP_INDEX_URL')],
-              ['pip_trusted_host', Cypress.env('PIP_TRUSTED_HOST')],
-            ]),
-          );
-          waitForDspaReady(projectName);
-          waitForDspaWebhookReady(projectName);
-          waitForDspaApiServerPodReady(projectName);
+          createDsPipelineCustomEnvVarsConfigMap(projectName);
+          waitForDspaReady(projectName, DSPA_READY_TIMEOUT_MS);
+          waitForDspaWebhookReady(projectName, DSPA_READY_TIMEOUT_MS);
+          waitForDspaApiServerPodReady(projectName, DSPA_POD_TIMEOUT_MS);
         },
       );
     });
@@ -90,9 +85,9 @@ describe(
       projectListPage.findProjectLink(projectName).click();
 
       cy.step('Wait for the pipeline server (DSPA) and MLflow webhook to be ready');
-      waitForDspaReady(projectName);
-      waitForDspaWebhookReady(projectName);
-      waitForDspaApiServerPodReady(projectName);
+      waitForDspaReady(projectName, DSPA_READY_TIMEOUT_MS);
+      waitForDspaWebhookReady(projectName, DSPA_READY_TIMEOUT_MS);
+      waitForDspaApiServerPodReady(projectName, DSPA_POD_TIMEOUT_MS);
 
       cy.step('Ensure Import Pipeline button is loaded');
       projectDetails.ensureImportPipelineButtonLoaded();

packages/cypress/cypress/types.ts

@@ -68,9 +68,9 @@ export type DspaReplacements = {
   AWS_REGION: string;
   AWS_S3_HOST: string;
   AWS_S3_SCHEME: string;
-  MLFLOW_INTEGRATION_MODE?: string;
-  MLFLOW_INJECT_USER_ENV_VARS?: string;
-  PIPELINE_STORE?: string;
+  MLFLOW_INTEGRATION_MODE: string;
+  MLFLOW_INJECT_USER_ENV_VARS: string;
+  PIPELINE_STORE: string;
 };
 
 export type StorageClassConfig = {

packages/cypress/cypress/utils/autoXPipelines.ts

@@ -76,6 +76,9 @@ export const provisionProjectForAutoX = (
     AWS_REGION: bucketConfig.REGION,
     AWS_S3_HOST: host,
     AWS_S3_SCHEME: scheme,
+    MLFLOW_INTEGRATION_MODE: 'DISABLED',
+    MLFLOW_INJECT_USER_ENV_VARS: 'false',
+    PIPELINE_STORE: 'database',
   };
   createDSPA(dspaReplacements, 'resources/yaml/autox_dspa.yaml');
 };

packages/cypress/cypress/utils/mlflowPipelineTestFlows.ts

@@ -73,23 +73,16 @@ export const fillAndSubmitMlflowIrisRun = (
 };
 
 const openPipelineDetails = (pipelineName: string): void => {
-  pipelineDetails.findPageTitle(MLFLOW_UI_TIMEOUT_MS).should(($title) => {
+  const pageTitle = pipelineDetails.findPageTitle(MLFLOW_UI_TIMEOUT_MS);
+  pageTitle.should('not.have.text', '');
+  pageTitle.then(($title) => {
     if ($title.text().trim() === pipelineName) {
       return;
     }
-    expect(
-      $title
-        .closest('body')
-        .find('[data-testid="pipelines-table"] a')
-        .filter((_, el) => (el.textContent || '').trim() === pipelineName).length,
-      `pipelines-table link for ${pipelineName}`,
-    ).to.be.greaterThan(0);
-  });
-  pipelineDetails.findPageTitle().then(($title) => {
-    if ($title.text().trim() === pipelineName) {
-      return;
-    }
-    pipelinesTable.findPipelineLinkByName(pipelineName, MLFLOW_UI_TIMEOUT_MS).click();
+    pipelinesTable
+      .findPipelineLinkByName(pipelineName, MLFLOW_UI_TIMEOUT_MS)
+      .should('exist')
+      .click();
   });
   pipelineDetails.findPageTitle(MLFLOW_UI_TIMEOUT_MS).should('have.text', pipelineName);
 };
@@ -100,7 +93,7 @@ export const importMlflowPipelineFromFile = (
   description: string,
   yamlPath: string,
 ): void => {
-  pipelinesGlobal.findImportPipelineButton().click();
+  pipelinesGlobal.findImportPipelineButton(MLFLOW_UI_TIMEOUT_MS).click();
   pipelineImportModal.findPipelineNameInput().type(name);
   pipelineImportModal.findPipelineDescriptionInput().type(description);
   pipelineImportModal.findUploadPipelineRadio().click();
@@ -131,15 +124,16 @@ export const createMlflowRunFromPipelineDetails = (
  * run's Argo workflow via oc until Succeeded.
  */
 export const waitForMlflowRunSucceeded = (projectName: string, timeout: number): void => {
-  cy.location('pathname', { timeout: MLFLOW_UI_TIMEOUT_MS }).should((pathname) => {
-    const runId = pathname.split('/').filter(Boolean).pop() ?? '';
-    expect(runId, `run details URL, got ${pathname}`).to.not.eq('create');
-    expect(runId.length, `run details URL, got ${pathname}`).to.be.greaterThan(0);
-  });
-  cy.location('pathname').then((pathname) => {
-    const runId = pathname.split('/').filter(Boolean).pop() ?? '';
-    waitForKfpRunSucceeded(projectName, runId, timeout);
-  });
+  cy.location('pathname', { timeout: MLFLOW_UI_TIMEOUT_MS })
+    .should((pathname) => {
+      const runId = pathname.split('/').filter(Boolean).pop() ?? '';
+      expect(runId, `run details URL, got ${pathname}`).to.not.eq('create');
+      expect(runId.length, `run details URL, got ${pathname}`).to.be.greaterThan(0);
+    })
+    .then((pathname) => {
+      const runId = pathname.split('/').filter(Boolean).pop() ?? '';
+      waitForKfpRunSucceeded(projectName, runId, timeout);
+    });
 };
 
 /** Assert that submitting the compare-runs action redirected to the MLflow compare-runs page. */

packages/cypress/cypress/utils/oc_commands/configmap.ts

@@ -33,3 +33,29 @@ export const createOpenShiftConfigMap = (
     return result;
   });
 };
+
+/**
+ * ConfigMap the iris pip-index pipeline mounts as PIP_INDEX_URL / PIP_TRUSTED_HOST.
+ * No-op when those Cypress env vars are unset.
+ */
+export const createDsPipelineCustomEnvVarsConfigMap = (
+  namespace: string,
+): Cypress.Chainable<CommandLineResult> | undefined => {
+  const entries: [string, string][] = [];
+  const pipIndexUrl = Cypress.env('PIP_INDEX_URL') as string | undefined;
+  const pipTrustedHost = Cypress.env('PIP_TRUSTED_HOST') as string | undefined;
+  if (pipIndexUrl) {
+    entries.push(['pip_index_url', pipIndexUrl]);
+  }
+  if (pipTrustedHost) {
+    entries.push(['pip_trusted_host', pipTrustedHost]);
+  }
+  if (entries.length === 0) {
+    return undefined;
+  }
+  return createOpenShiftConfigMap(
+    'ds-pipeline-custom-env-vars',
+    namespace,
+    Object.fromEntries(entries),
+  );
+};

packages/cypress/cypress/utils/oc_commands/dspa.ts

@@ -53,17 +53,17 @@ type DspaCondition = { type?: string; status?: string; reason?: string; message?
  * Uses oc wait --for=condition=Ready similar to other resource waits in the codebase.
  *
  * @param projectName - The namespace/project containing the DSPA
- * @param timeout - Timeout in seconds (default 600s = 10 minutes)
+ * @param timeout - Cypress/oc wait timeout in milliseconds (default 600s)
  */
 export const waitForDspaReady = (
   projectName: string,
-  timeout = '600s',
+  timeout = 600000,
 ): Cypress.Chainable<CommandLineResult> => {
-  const command = `oc wait --for=condition=Ready dspa/${DSPA_RESOURCE_NAME} -n ${projectName} --timeout=${timeout}`;
+  const command = `oc wait --for=condition=Ready dspa/${DSPA_RESOURCE_NAME} -n ${projectName} --timeout=${timeout}ms`;
   cy.log(`Waiting for DSPA to be ready: ${command}`);
 
   return cy
-    .exec(command, { failOnNonZeroExit: false, timeout: 610000 })
+    .exec(command, { failOnNonZeroExit: false, timeout })
     .then((result: CommandLineResult) => {
       if (result.exitCode !== 0) {
         cy.log(`DSPA wait failed (exit ${result.exitCode}): ${maskSensitiveInfo(result.stderr)}`);

packages/cypress/cypress/utils/oc_commands/mlflow.ts

@@ -10,7 +10,7 @@ const UI_POLL_CONFIG = {
   pollIntervalMs: 5000,
 } as const;
 
-const assertNamespace = (namespace: string): string => {
+export const assertNamespace = (namespace: string): string => {
   if (!K8S_NAMESPACE_RE.test(namespace)) {
     throw new Error(`Invalid namespace: ${namespace}`);
   }
@@ -473,12 +473,13 @@ export const waitForMlflowBffConfigured = (timeoutMs = 60000): Cypress.Chainable
 
 export const waitForDspaWebhookReady = (
   projectName: string,
-  timeout = '600s',
-): Cypress.Chainable<CommandLineResult> =>
-  cy
-    .exec(`oc wait --for=condition=WebhookReady dspa/dspa -n ${projectName} --timeout=${timeout}`, {
+  timeout: number,
+): Cypress.Chainable<CommandLineResult> => {
+  const ns = assertNamespace(projectName);
+  return cy
+    .exec(`oc wait --for=condition=WebhookReady dspa/dspa -n ${ns} --timeout=${timeout}ms`, {
       failOnNonZeroExit: false,
-      timeout: 610000,
+      timeout,
     })
     .then((result) => {
       if (result.exitCode !== 0) {
@@ -488,6 +489,7 @@ export const waitForDspaWebhookReady = (
       }
       return result;
     });
+};
 
 /**
  * DSPA condition Ready can flip True before the API server pod is Ready.
@@ -497,13 +499,13 @@ export const waitForDspaWebhookReady = (
  */
 export const waitForDspaApiServerPodReady = (
   projectName: string,
-  timeout = '300s',
+  timeout: number,
 ): Cypress.Chainable<CommandLineResult> => {
-  const timeoutMs = (Number.parseInt(timeout, 10) || 300) * 1000 + 10000;
+  const ns = assertNamespace(projectName);
   return cy
     .exec(
-      `oc wait --for=condition=Ready pod -l app=ds-pipeline-dspa -n ${projectName} --timeout=${timeout}`,
-      { failOnNonZeroExit: false, timeout: timeoutMs },
+      `oc wait --for=condition=Ready pod -l app=ds-pipeline-dspa -n ${ns} --timeout=${timeout}ms`,
+      { failOnNonZeroExit: false, timeout },
     )
     .then((result) => {
       if (result.exitCode !== 0) {