Add E2E tests for model registry register-and-store OCI flow (#6743)

* add e2e test for register and store flow

* address coderabbit comments

* fix tests

* restest

* address comments

* add strings

* address comments

* adjust path and add job check

* remove feature flag path

* Add URI origin flow

* fix lint error

* address comments for uri flow

* retest

* address comments and fix test flakiness

* adjust the tests

* adjust the test and address comments

* adjust the form namespace selector

* adjust test

* adjust test

* add contributions

* fix typecheck

* retest

---------

Co-authored-by: Conor O'Malley <conormomalley@gmail.com>
Co-authored-by: Conor O'Malley <97108400+ConorOM1@users.noreply.github.com>

Author: Taj010

packages/cypress/cypress/fixtures/e2e/modelRegistry/testModelRegistry.yaml

@@ -64,4 +64,28 @@ newDatabaseUsername: "mlmduser_updated"
 newDatabasePassword: "NewTestPassword123"
 
 # Object storage paths for v2
-objectStoragePathV2: "models/test-model/v2.0"
+objectStoragePathV2: "models/test-model/v2.0"
+
+# OCI Register and Store
+ociModelName: "test-oci-model"
+ociModelDescription: "E2E test model using OCI register and store"
+ociVersionName: "v1.0"
+ociVersionDescription: "First version via OCI transfer job"
+ociModelFormat: "onnx"
+ociModelFormatVersion: "1.0"
+ociJobName: "oci-transfer-job"
+ociSourceEndpoint: "http://minio.example.com:9000"
+ociSourceBucket: "test-models"
+ociSourceRegion: "us-east-1"
+ociSourcePath: "models/oci-test-model/v1.0"
+ociTransferJobStartedNotification: "Model transfer job started"
+ociTransferJobFailedNotification: "Model transfer job failed"
+ociDestinationRegistry: "quay.io"
+ociDestinationUri: "quay.io/test-org/test-oci-model:v1"
+ociDestinationUsername: "dummy-oci-user"
+ociDestinationPassword: "dummy-oci-pass"
+
+# OCI Register and Store — URI origin variant
+ociUriModelName: "test-oci-uri-model"
+ociUriJobName: "oci-uri-transfer-job"
+ociUriOriginUri: "s3://test-models/models/oci-test-model/v1.0?endpoint=http%3A%2F%2Fminio.example.com%3A9000&defaultRegion=us-east-1"

packages/cypress/cypress/fixtures/resources/yaml/model_registry_project_rolebinding.yaml

@@ -0,0 +1,21 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{PROJECT_NAME}}-rb
+  namespace: {{NAMESPACE}}
+  labels:
+    opendatahub.io/dashboard: "true"
+    opendatahub.io/rb-project-subject: "true"
+    app: {{REGISTRY_NAME}}
+    app.kubernetes.io/component: model-registry
+    app.kubernetes.io/part-of: model-registry
+    app.kubernetes.io/name: {{REGISTRY_NAME}}
+    component: model-registry
+subjects:
+  - kind: Group
+    apiGroup: rbac.authorization.k8s.io
+    name: system:serviceaccounts:{{PROJECT_NAME}}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: registry-user-{{REGISTRY_NAME}}

packages/cypress/cypress/pages/modelRegistry.ts

@@ -58,25 +58,25 @@ class ModelRegistry {
     this.waitLanding();
   }
 
-  visit() {
-    this.visitWithRegistry('modelregistry-sample');
+  visit(registryName = 'modelregistry-sample') {
+    cy.visitWithLogin(`/ai-hub/registry/${registryName}`);
+    cy.findByTestId('app-page-title', { timeout: 60000 }).should('exist');
   }
 
   visitWithRegistry(registryName: string) {
-    cy.visitWithLogin(`/ai-hub/models/registry/${registryName}`);
-    this.wait();
+    this.visit(registryName);
   }
 
   navigate() {
-    appChrome.findNavItem({ name: 'Models', rootSection: 'AI hub' }).click();
+    appChrome
+      .findNavItem({ name: 'Registry', rootSection: 'AI hub', subSection: 'Models' })
+      .click();
     this.wait();
   }
 
   private wait() {
-    cy.findByTestId('app-tab-page-title').should('exist');
-    cy.findByText('Select a model registry to view and manage your registered models.', {
-      exact: false,
-    }).should('exist');
+    cy.findByTestId('app-page-title').should('exist');
+    cy.findByTestId('app-page-title').contains('Registry');
     cy.testA11y();
   }
 
@@ -134,12 +134,16 @@ class ModelRegistry {
   }
 
   tabEnabled() {
-    appChrome.findNavItem({ name: 'Models', rootSection: 'AI hub' }).should('exist');
+    appChrome
+      .findNavItem({ name: 'Registry', rootSection: 'AI hub', subSection: 'Models' })
+      .should('exist');
     return this;
   }
 
   tabDisabled() {
-    appChrome.findNavItem({ name: 'Models', rootSection: 'AI hub' }).should('not.exist');
+    appChrome
+      .findNavItem({ name: 'Registry', rootSection: 'AI hub', subSection: 'Models' })
+      .should('not.exist');
     return this;
   }
 

packages/cypress/cypress/pages/modelRegistry/registerAndStorePage.ts

@@ -22,8 +22,16 @@ class RegisterAndStorePage {
     return cy.findByTestId('namespace-form-group');
   }
 
-  findProjectSelectorToggle() {
-    return cy.findByTestId('project-selector-toggle');
+  findProjectSelectorToggle(timeout?: number) {
+    return cy.findByTestId('project-selector-toggle', { timeout });
+  }
+
+  findProjectSelectorSearch() {
+    return cy.findByTestId('project-selector-search');
+  }
+
+  findProjectSelectorMenuList() {
+    return cy.findByTestId('project-selector-menuList');
   }
 
   findNoAccessAlert() {

packages/cypress/cypress/pages/modelRegistry/registerModelPage.ts

@@ -14,6 +14,13 @@ export enum FormFieldSelector {
   LOCATION_PATH = '#location-path',
   LOCATION_TYPE_URI = '#location-type-uri',
   LOCATION_URI = '#location-uri',
+  JOB_NAME = '#model-transfer-job-name',
+  LOCATION_S3_ACCESS_KEY_ID = '#location-s3-access-key-id',
+  LOCATION_S3_SECRET_ACCESS_KEY = '#location-s3-secret-access-key',
+  DESTINATION_OCI_REGISTRY = '#destination-oci-registry',
+  DESTINATION_OCI_URI = '#destination-oci-uri',
+  DESTINATION_OCI_USERNAME = '#destination-oci-username',
+  DESTINATION_OCI_PASSWORD = '#destination-oci-password',
 }
 
 class RegisterModelPage {
@@ -67,13 +74,56 @@ class RegisterModelPage {
     return cy.findByTestId('autofill-modal-button');
   }
 
-  findSubmitButton() {
-    return cy.findByTestId('create-button');
+  findSubmitButton(timeout?: number) {
+    return cy.findByTestId('create-button', { timeout });
   }
 
   findModelNameError() {
     return cy.findByTestId('model-name-error');
   }
+
+  findRegistrationModeToggleGroup(timeout?: number) {
+    return cy.findByTestId('registration-mode-toggle-group', { timeout });
+  }
+
+  findRegisterToggle() {
+    return cy.findByTestId('registration-mode-register');
+  }
+
+  findRegisterAndStoreToggle() {
+    return cy.findByTestId('registration-mode-register-and-store');
+  }
+
+  findRegisterAndStoreToggleButton() {
+    return this.findRegisterAndStoreToggle().find('button');
+  }
+
+  findNamespaceSelector(timeout?: number) {
+    return cy.findByTestId('form-namespace-selector', { timeout });
+  }
+
+  findNamespaceSelectorTrigger() {
+    return cy.findByTestId('form-namespace-selector-trigger');
+  }
+
+  findNamespaceTextInput(timeout?: number) {
+    return cy.findByTestId('form-namespace-text-input', { timeout });
+  }
+
+  /**
+   * Namespace options render in the SimpleSelect menu (often portaled). Query by role after opening the menu.
+   */
+  findNamespaceOption(name: string) {
+    return cy.findByRole('option', { name });
+  }
+
+  findOriginLocationSection(timeout?: number) {
+    return cy.findByTestId('model-origin-location-section', { timeout });
+  }
+
+  findDestinationLocationSection(timeout?: number) {
+    return cy.findByTestId('model-destination-location-section', { timeout });
+  }
 }
 
 export const registerModelPage = new RegisterModelPage();