From d6ffe751f00372185e0426cdb1c180e580b144d9 Mon Sep 17 00:00:00 2001
From: Wen Zhou <wenzhou@redhat.com>
Date: Fri, 11 Aug 2023 17:01:23 +0200
Subject: [PATCH] Update e2e test:
- more timeout due to new components (for in sequence run)
- change validat component to run in concurrent
- add Ray in the testing
- logs for error message
- rename functions to align names
- set skip-deletion=false to test this case
Signed-off-by: Wen Zhou <wenzhou@redhat.com>
---
Makefile | 4 +-
tests/e2e/controller_setup_test.go | 12 +-
tests/e2e/dsc_creation_test.go | 223 +++++++++++++++++------------
tests/e2e/dsc_deletion_test.go | 54 +++----
tests/e2e/helper_test.go | 11 +-
tests/e2e/odh_manager_test.go | 10 +-
6 files changed, 181 insertions(+), 133 deletions(-)
diff --git a/Makefile b/Makefile
index 130da52fc31..000f117da25 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ test: manifests generate fmt vet envtest ## Run tests.
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./controllers/... -coverprofile cover.out
# E2E tests additional flags
-E2E_TEST_FLAGS = "--skip-deletion=true" # See README.md
+E2E_TEST_FLAGS = "--skip-deletion=false" -timeout 15m # See README.md, default go test timeout 10m
##@ Build
@@ -294,4 +294,4 @@ toolbox: ## Create a toolbox instance with the proper Golang and Operator SDK ve
.PHONY: e2e-test
e2e-test: ## Run e2e tests for the controller
- go test ./tests/e2e/ -run ^TestOdhOperator -v --operator-namespace=${OPERATOR_NAMESPACE} ${E2E_TEST_FLAGS}
\ No newline at end of file
+ go test ./tests/e2e/ -run ^TestOdhOperator -v --operator-namespace=${OPERATOR_NAMESPACE} ${E2E_TEST_FLAGS}
diff --git a/tests/e2e/controller_setup_test.go b/tests/e2e/controller_setup_test.go
index 076486be9e6..24ec5a374ee 100644
--- a/tests/e2e/controller_setup_test.go
+++ b/tests/e2e/controller_setup_test.go
@@ -81,7 +81,7 @@ func NewTestContext() (*testContext, error) {
dscInit := &dsci.DSCInitialization{}
err = custClient.Get(context.TODO(), types.NamespacedName{Name: "default"}, dscInit)
if err != nil {
- return nil, errors.Wrap(err, "error getting DSCInitialization instance")
+ return nil, errors.Wrap(err, "error getting DSCInitialization instance 'default'")
}
return &testContext{
@@ -108,13 +108,15 @@ func TestOdhOperator(t *testing.T) {
utilruntime.Must(dsc.AddToScheme(scheme))
// individual test suites after the operator is running
- if !t.Run("validate operator pod", testODHOperatorValidation) {
+ if !t.Run("validate operator pod is running", testODHOperatorValidation) {
return
}
- // Run create and delete tests for all the test KfDefs
- t.Run("create", creationTestSuite)
+ // Run create and delete tests for all the components
+ t.Run("create Opendatahub components", creationTestSuite)
+
+ // Run deleteion if skipDeletion is not set
if !skipDeletion {
- t.Run("delete", deletionTestSuite)
+ t.Run("delete components", deletionTestSuite)
}
}
diff --git a/tests/e2e/dsc_creation_test.go b/tests/e2e/dsc_creation_test.go
index 5a8fb92eea6..d8780822d7e 100644
--- a/tests/e2e/dsc_creation_test.go
+++ b/tests/e2e/dsc_creation_test.go
@@ -26,33 +26,31 @@ func creationTestSuite(t *testing.T) {
t.Run(testCtx.testDsc.Name, func(t *testing.T) {
t.Run("Creation of DataScienceCluster instance", func(t *testing.T) {
err = testCtx.testDSCCreation()
- require.NoError(t, err, "error creating DataScienceCluster object ")
+ require.NoError(t, err, "error creating DataScienceCluster instance")
})
- t.Run("Validate deployed applications", func(t *testing.T) {
- err = testCtx.testAllDSCApplications()
- require.NoError(t, err, "error testing deployments for application %v", testCtx.testDsc.Name)
-
+ t.Run("Validate all deployed components", func(t *testing.T) {
+ err = testCtx.testAllApplicationCreation(t)
+ require.NoError(t, err, "error testing deployments for DataScienceCluster: "+testCtx.testDsc.Name)
})
- t.Run("Validate Ownerrefrences are added", func(t *testing.T) {
+ t.Run("Validate Ownerrefrences exist", func(t *testing.T) {
err = testCtx.testOwnerrefrences()
- require.NoError(t, err, "error testing DSC Ownerrefrences ")
+ require.NoError(t, err, "error getting all DataScienceCluster's Ownerrefrences")
})
- t.Run("Validate Controller Reverts Updates", func(t *testing.T) {
- err = testCtx.testUpdateManagedResource()
- require.NoError(t, err, "error testing updates for DSC managed resource ")
+ t.Run("Validate Controller reconcile", func(t *testing.T) {
+ // only test Dashboard component for now
+ err = testCtx.testUpdateComponentReconcile()
+ require.NoError(t, err, "error testing updates for DSC managed resource")
})
t.Run("Validate Component Enabled field", func(t *testing.T) {
- err = testCtx.testUpdatingComponentEnabledField()
+ err = testCtx.testUpdateDSCComponentEnabled()
require.NoError(t, err, "error testing component enabled field")
})
-
})
-
}
func (tc *testContext) testDSCCreation() error {
-
// Create DataScienceCluster resource if not already created
+
dscLookupKey := types.NamespacedName{Name: tc.testDsc.Name}
createdDSC := &dsc.DataScienceCluster{}
existingDSCList := &dsc.DataScienceClusterList{}
@@ -72,7 +70,7 @@ func (tc *testContext) testDSCCreation() error {
nberr := wait.PollUntilContextTimeout(tc.ctx, tc.resourceRetryInterval, tc.resourceCreationTimeout, false, func(ctx context.Context) (done bool, err error) {
creationErr := tc.customClient.Create(tc.ctx, tc.testDsc)
if creationErr != nil {
- log.Printf("Error creating DSC resource %v: %v, trying again",
+ log.Printf("error creating DSC resource %v: %v, trying again",
tc.testDsc.Name, creationErr)
return false, nil
} else {
@@ -80,17 +78,18 @@ func (tc *testContext) testDSCCreation() error {
}
})
if nberr != nil {
- return fmt.Errorf("error creating test DSC %s: %v", tc.testDsc.Name, nberr)
+ return fmt.Errorf("error creating e2e-test DSC %s: %v", tc.testDsc.Name, nberr)
}
} else {
- return fmt.Errorf("error getting test DSC %s: %v", tc.testDsc.Name, err)
+ return fmt.Errorf("error getting e2e-test DSC %s: %v", tc.testDsc.Name, err)
}
}
return nil
}
-func (tc *testContext) testAllDSCApplications() error {
+func (tc *testContext) testAllApplicationCreation(t *testing.T) error {
// Validate test instance is in Ready state
+
dscLookupKey := types.NamespacedName{Name: tc.testDsc.Name}
createdDSC := &dsc.DataScienceCluster{}
@@ -106,80 +105,116 @@ func (tc *testContext) testAllDSCApplications() error {
// Verify DSC instance is in Ready phase
if tc.testDsc.Status.Phase != "Ready" {
return fmt.Errorf("DSC instance is not in Ready phase. Current phase: %v", tc.testDsc.Status.Phase)
-
}
- // Verify every component status matches the given enable value
- err = tc.testDSCApplication(&(tc.testDsc.Spec.Components.Dashboard))
- // enabled applications should not have any error
- if tc.testDsc.Spec.Components.Dashboard.Enabled {
- if err != nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.Dashboard)
- }
- } else {
- if err == nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.Dashboard)
+ t.Run("Validate Dashboard", func(t *testing.T) {
+ // speed testing in parallel
+ t.Parallel()
+ err = tc.testApplicationCreation(&(tc.testDsc.Spec.Components.Dashboard))
+ if tc.testDsc.Spec.Components.Dashboard.Enabled {
+ if err != nil {
+ require.NoError(t, err, "error validating application %v when enabled", tc.testDsc.Spec.Components.Dashboard.GetComponentName())
+ }
+ } else {
+ if err == nil {
+ require.NoError(t, err, "error validating application %v when disabled", tc.testDsc.Spec.Components.Dashboard.GetComponentName())
+ }
}
- }
+ })
- err = tc.testDSCApplication(&(tc.testDsc.Spec.Components.ModelMeshServing))
- if tc.testDsc.Spec.Components.ModelMeshServing.Enabled {
- if err != nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.ModelMeshServing)
- }
- } else {
- if err == nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.ModelMeshServing)
+ t.Run("Validate ModelMeshServing", func(t *testing.T) {
+ // speed testing in parallel
+ t.Parallel()
+ err = tc.testApplicationCreation(&(tc.testDsc.Spec.Components.ModelMeshServing))
+ if tc.testDsc.Spec.Components.ModelMeshServing.Enabled {
+ if err != nil {
+ require.NoError(t, err, "error validating application %v when enabled", tc.testDsc.Spec.Components.ModelMeshServing.GetComponentName())
+ }
+ } else {
+ if err == nil {
+ require.NoError(t, err, "error validating application %v when disabled", tc.testDsc.Spec.Components.ModelMeshServing.GetComponentName())
+ }
}
- }
+ })
- err = tc.testDSCApplication(&(tc.testDsc.Spec.Components.Kserve))
- if tc.testDsc.Spec.Components.Kserve.Enabled {
- if err != nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.Kserve)
- }
- } else {
- if err == nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.Kserve)
+ t.Run("Validate Kserve", func(t *testing.T) {
+ // speed testing in parallel
+ t.Parallel()
+ err = tc.testApplicationCreation(&(tc.testDsc.Spec.Components.Kserve))
+ if tc.testDsc.Spec.Components.Kserve.Enabled {
+ if err != nil {
+ require.NoError(t, err, "error validating application %v when enabled", tc.testDsc.Spec.Components.Kserve.GetComponentName())
+ }
+ } else {
+ if err == nil {
+ require.NoError(t, err, "error validating application %v when disabled", tc.testDsc.Spec.Components.Kserve.GetComponentName())
+ }
}
- }
+ })
- err = tc.testDSCApplication(&(tc.testDsc.Spec.Components.Workbenches))
- if tc.testDsc.Spec.Components.Workbenches.Enabled {
- if err != nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.Workbenches)
- }
- } else {
- if err == nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.Workbenches)
+ t.Run("Validate Workbenches", func(t *testing.T) {
+ // speed testing in parallel
+ t.Parallel()
+ err = tc.testApplicationCreation(&(tc.testDsc.Spec.Components.Workbenches))
+ if tc.testDsc.Spec.Components.Workbenches.Enabled {
+ if err != nil {
+ require.NoError(t, err, "error validating application %v when enabled", tc.testDsc.Spec.Components.Workbenches.GetComponentName())
+ }
+ } else {
+ if err == nil {
+ require.NoError(t, err, "error validating application %v when disabled", tc.testDsc.Spec.Components.Workbenches.GetComponentName())
+ }
}
- }
+ })
- err = tc.testDSCApplication(&(tc.testDsc.Spec.Components.DataSciencePipelines))
- if tc.testDsc.Spec.Components.DataSciencePipelines.Enabled {
- if err != nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.DataSciencePipelines)
- }
- } else {
- if err == nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.DataSciencePipelines)
+ t.Run("Validate DataSciencePipelines", func(t *testing.T) {
+ // speed testing in parallel
+ t.Parallel()
+ err = tc.testApplicationCreation(&(tc.testDsc.Spec.Components.DataSciencePipelines))
+ if tc.testDsc.Spec.Components.DataSciencePipelines.Enabled {
+ if err != nil {
+ require.NoError(t, err, "error validating application %v when enabled", tc.testDsc.Spec.Components.DataSciencePipelines.GetComponentName())
+ }
+ } else {
+ if err == nil {
+ require.NoError(t, err, "error validating application %v when disabled", tc.testDsc.Spec.Components.DataSciencePipelines.GetComponentName())
+ }
}
- }
+ })
- err = tc.testDSCApplication(&(tc.testDsc.Spec.Components.CodeFlare))
- if tc.testDsc.Spec.Components.CodeFlare.Enabled {
- if err != nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.CodeFlare)
+ t.Run("Validate CodeFlare", func(t *testing.T) {
+ // speed testing in parallel
+ t.Parallel()
+ err = tc.testApplicationCreation(&(tc.testDsc.Spec.Components.CodeFlare))
+ if tc.testDsc.Spec.Components.CodeFlare.Enabled {
+ if err != nil {
+ require.NoError(t, err, "error validating application %v when enabled", tc.testDsc.Spec.Components.CodeFlare.GetComponentName())
+ }
+ } else {
+ if err == nil {
+ require.NoError(t, err, "error validating application %v when disabled", tc.testDsc.Spec.Components.CodeFlare.GetComponentName())
+ }
}
- } else {
- if err == nil {
- return fmt.Errorf("error validating application %v", tc.testDsc.Spec.Components.CodeFlare)
+ })
+
+ t.Run("Validate Ray", func(t *testing.T) {
+ // speed testing in parallel
+ t.Parallel()
+ err = tc.testApplicationCreation(&(tc.testDsc.Spec.Components.Ray))
+ if tc.testDsc.Spec.Components.Ray.Enabled {
+ if err != nil {
+ require.NoError(t, err, "error validating application %v when enabled", tc.testDsc.Spec.Components.Ray.GetComponentName())
+ }
+ } else {
+ if err == nil {
+ require.NoError(t, err, "error validating application %v when disabled", tc.testDsc.Spec.Components.Ray.GetComponentName())
+ }
}
- }
+ })
return nil
}
-func (tc *testContext) testDSCApplication(component components.ComponentInterface) error {
+func (tc *testContext) testApplicationCreation(component components.ComponentInterface) error {
err := wait.PollUntilContextTimeout(tc.ctx, tc.resourceRetryInterval, tc.resourceCreationTimeout, false, func(ctx context.Context) (done bool, err error) {
appList, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).List(context.TODO(), metav1.ListOptions{
LabelSelector: "app.kubernetes.io/part-of=" + component.GetComponentName(),
@@ -232,7 +267,7 @@ func (tc *testContext) testOwnerrefrences() error {
return nil
}
-func (tc *testContext) testUpdateManagedResource() error {
+func (tc *testContext) testUpdateComponentReconcile() error {
// Test Updating Dashboard Replicas
appDeployments, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).List(context.TODO(), metav1.ListOptions{
@@ -257,30 +292,30 @@ func (tc *testContext) testUpdateManagedResource() error {
}
retrievedDep, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).UpdateScale(context.TODO(), testDeployment.Name, patchedReplica, metav1.UpdateOptions{})
if err != nil {
-
- return fmt.Errorf("error patching application resources : %v", err)
+ return fmt.Errorf("error patching component resources : %v", err)
}
if retrievedDep.Spec.Replicas != patchedReplica.Spec.Replicas {
- return fmt.Errorf("failed to patch replicas")
+ return fmt.Errorf("failed to patch replicas : expect to be %v but got %v", patchedReplica.Spec.Replicas, retrievedDep.Spec.Replicas)
}
+
// Sleep for 20 seconds to allow the operator to reconcile
time.Sleep(2 * tc.resourceRetryInterval)
revertedDep, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).Get(context.TODO(), testDeployment.Name, metav1.GetOptions{})
if err != nil {
- return fmt.Errorf("error getting application resource : %v", err)
+ return fmt.Errorf("error getting component resource after reconcile: %v", err)
}
-
if *revertedDep.Spec.Replicas != *expectedReplica {
- return fmt.Errorf("failed to revert updated resource")
+ return fmt.Errorf("failed to revert back replicas : expect to be %v but got %v", *expectedReplica, *revertedDep.Spec.Replicas)
}
}
return nil
}
-func (tc *testContext) testUpdatingComponentEnabledField() error {
- // Update any component to be disabled
+func (tc *testContext) testUpdateDSCComponentEnabled() error {
+ // Test Updating dashboard to be disabled
+
var dashboardDeploymentName string
if tc.testDsc.Spec.Components.Dashboard.Enabled {
appDeployments, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).List(context.TODO(), metav1.ListOptions{
@@ -292,9 +327,11 @@ func (tc *testContext) testUpdatingComponentEnabledField() error {
if len(appDeployments.Items) > 0 {
dashboardDeploymentName = appDeployments.Items[0].Name
if appDeployments.Items[0].Status.ReadyReplicas == 0 {
- return fmt.Errorf("error getting ready replicas of enabled component: %v", dashboardDeploymentName)
+ return fmt.Errorf("error getting enabled component: %s its deployment 'ReadyReplicas'", dashboardDeploymentName)
}
}
+ } else {
+ return fmt.Errorf("dashboard spec should be in 'enabled: true' state in order to perform test")
}
// Disable component Dashboard
@@ -302,7 +339,7 @@ func (tc *testContext) testUpdatingComponentEnabledField() error {
// refresh the instance in case it was updated during the reconcile
err := tc.customClient.Get(tc.ctx, types.NamespacedName{Name: tc.testDsc.Name}, tc.testDsc)
if err != nil {
- return err
+ return fmt.Errorf("error getting resource %v", err)
}
// Disable the Component
tc.testDsc.Spec.Components.Dashboard.Enabled = false
@@ -311,21 +348,21 @@ func (tc *testContext) testUpdatingComponentEnabledField() error {
err = tc.customClient.Update(context.TODO(), tc.testDsc)
// Return err itself here (not wrapped inside another error)
// so that RetryOnConflict can identify it correctly.
- return err
+ if err != nil {
+ return fmt.Errorf("error updating component from 'enabled: true' to 'enabled: false': %v", err)
+ }
+ return nil
})
- if err != nil {
- return fmt.Errorf("error updating component from enabled true to false %v", err)
- }
// Sleep for 20 seconds to allow the operator to reconcile
time.Sleep(2 * tc.resourceRetryInterval)
_, err = tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).Get(context.TODO(), dashboardDeploymentName, metav1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
- return nil
+ return nil // correct result: should not find deployment after we disable it already
}
- return err
+ return fmt.Errorf("error getting component resource after reconcile: %v", err)
} else {
- return fmt.Errorf("component %v not disabled", tc.testDsc.Spec.Components.Dashboard.GetComponentName())
+ return fmt.Errorf("component %v is disabled, should not get its deployment %v from NS %v any more", tc.testDsc.Spec.Components.Dashboard.GetComponentName(), dashboardDeploymentName, tc.applicationsNamespace)
}
}
diff --git a/tests/e2e/dsc_deletion_test.go b/tests/e2e/dsc_deletion_test.go
index af5ba88e278..73bd165af30 100644
--- a/tests/e2e/dsc_deletion_test.go
+++ b/tests/e2e/dsc_deletion_test.go
@@ -23,13 +23,13 @@ func deletionTestSuite(t *testing.T) {
require.NoError(t, err)
t.Run(testCtx.testDsc.Name, func(t *testing.T) {
- t.Run("DataScienceCluster instance Deletion", func(t *testing.T) {
+ t.Run("Deletion: DataScienceCluster instance", func(t *testing.T) {
err = testCtx.testDSCDeletion()
- require.NoError(t, err, "error deleting DSC object ")
+ require.NoError(t, err, "Error to delete DSC instance")
})
- t.Run("Application Resource Deletion", func(t *testing.T) {
+ t.Run("Deletion: Application Resource", func(t *testing.T) {
err = testCtx.testAllApplicationDeletion()
- require.NoError(t, err, "error testing deletion of DSC defined applications")
+ require.NoError(t, err, "Error to delete component")
})
})
@@ -37,6 +37,7 @@ func deletionTestSuite(t *testing.T) {
func (tc *testContext) testDSCDeletion() error {
// Delete test DataScienceCluster resource if found
+
dscLookupKey := types.NamespacedName{Name: tc.testDsc.Name}
expectedDSC := &dsc.DataScienceCluster{}
@@ -44,25 +45,25 @@ func (tc *testContext) testDSCDeletion() error {
if err == nil {
dscerr := tc.customClient.Delete(tc.ctx, expectedDSC, &client.DeleteOptions{})
if dscerr != nil {
- return fmt.Errorf("error deleting test DSC %s: %v", expectedDSC.Name, dscerr)
+ return fmt.Errorf("error deleting DSC instance %s: %v", expectedDSC.Name, dscerr)
}
} else if !errors.IsNotFound(err) {
if err != nil {
- return fmt.Errorf("error getting test DSC instance :%v", err)
+ return fmt.Errorf("error getting DSC instance :%v", err)
}
}
return nil
}
func (tc *testContext) testApplicationDeletion(component components.ComponentInterface) error {
-
// Deletion of Deployments
+
if err := wait.PollUntilContextTimeout(tc.ctx, tc.resourceRetryInterval, tc.resourceCreationTimeout, false, func(ctx context.Context) (done bool, err error) {
appList, err := tc.kubeClient.AppsV1().Deployments(tc.applicationsNamespace).List(ctx, metav1.ListOptions{
LabelSelector: "app.kubernetes.io/part-of=" + component.GetComponentName(),
})
if err != nil {
- log.Printf("error listing application deployments :%v. Trying again...", err)
+ log.Printf("error listing component deployments :%v. Trying again...", err)
return false, err
}
if len(appList.Items) != 0 {
@@ -71,42 +72,41 @@ func (tc *testContext) testApplicationDeletion(component components.ComponentInt
return true, nil
}
}); err != nil {
- return err
+ return fmt.Errorf("error deleting component: %v", component.GetComponentName())
}
return nil
}
func (tc *testContext) testAllApplicationDeletion() error {
+ // Deletion all listed components' deployments
- err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.Dashboard))
- if err != nil {
- return fmt.Errorf("error deleting application %v", tc.testDsc.Spec.Components.Dashboard)
+ if err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.Dashboard)); err != nil {
+ return err
}
- err = tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.ModelMeshServing))
- if err != nil {
- return fmt.Errorf("error deleting application %v", tc.testDsc.Spec.Components.ModelMeshServing)
+ if err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.ModelMeshServing)); err != nil {
+ return err
}
- err = tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.Kserve))
- if err != nil {
- return fmt.Errorf("error deleting application %v", tc.testDsc.Spec.Components.Kserve)
+ if err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.Kserve)); err != nil {
+ return err
}
- err = tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.Workbenches))
- if err != nil {
- return fmt.Errorf("error deleting application %v", tc.testDsc.Spec.Components.Workbenches)
+ if err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.Workbenches)); err != nil {
+ return err
+ }
+
+ if err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.DataSciencePipelines)); err != nil {
+ return err
}
- err = tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.DataSciencePipelines))
- if err != nil {
- return fmt.Errorf("error deleting application %v", tc.testDsc.Spec.Components.DataSciencePipelines)
+ if err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.CodeFlare)); err != nil {
+ return err
}
- err = tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.CodeFlare))
- if err != nil {
- return fmt.Errorf("error deleting application %v", tc.testDsc.Spec.Components.CodeFlare)
+ if err := tc.testApplicationDeletion(&(tc.testDsc.Spec.Components.Ray)); err != nil {
+ return err
}
return nil
}
diff --git a/tests/e2e/helper_test.go b/tests/e2e/helper_test.go
index e77152f39d9..2ab9304616a 100644
--- a/tests/e2e/helper_test.go
+++ b/tests/e2e/helper_test.go
@@ -11,6 +11,7 @@ import (
"github.com/opendatahub-io/opendatahub-operator/v2/components/datasciencepipelines"
"github.com/opendatahub-io/opendatahub-operator/v2/components/kserve"
"github.com/opendatahub-io/opendatahub-operator/v2/components/modelmeshserving"
+ "github.com/opendatahub-io/opendatahub-operator/v2/components/ray"
"github.com/opendatahub-io/opendatahub-operator/v2/components/workbenches"
corev1 "k8s.io/api/core/v1"
@@ -57,6 +58,7 @@ func setupDSCInstance() *dsc.DataScienceCluster {
},
Spec: dsc.DataScienceClusterSpec{
Components: dsc.Components{
+ // keep dashboard as enabled, because other test is rely on this
Dashboard: dashboard.Dashboard{
Component: components.Component{
Enabled: true,
@@ -87,6 +89,11 @@ func setupDSCInstance() *dsc.DataScienceCluster {
Enabled: false,
},
},
+ Ray: ray.Ray{
+ Component: components.Component{
+ Enabled: true,
+ },
+ },
},
},
}
@@ -104,7 +111,7 @@ func (tc *testContext) validateCRD(crdName string) error {
if errors.IsNotFound(err) {
return false, nil
}
- log.Printf("Failed to get %s crd", crdName)
+ log.Printf("Failed to get CRD %s", crdName)
return false, err
}
@@ -115,7 +122,7 @@ func (tc *testContext) validateCRD(crdName string) error {
}
}
}
- log.Printf("Error in getting %s crd ", crdName)
+ log.Printf("Error to get CRD %s condition's matching", crdName)
return false, nil
})
diff --git a/tests/e2e/odh_manager_test.go b/tests/e2e/odh_manager_test.go
index 99c53a23c6a..874fe38be67 100644
--- a/tests/e2e/odh_manager_test.go
+++ b/tests/e2e/odh_manager_test.go
@@ -9,24 +9,26 @@ import (
func testODHOperatorValidation(t *testing.T) {
testCtx, err := NewTestContext()
require.NoError(t, err)
- t.Run("Validate ODH Operator pod", testCtx.testODHDeployment)
- t.Run("Validate CRDs owned by the operator", testCtx.validateOwnedCRDs)
+
+ t.Run("validate ODH Operator pod", testCtx.testODHDeployment)
+ t.Run("validate CRDs owned by the operator", testCtx.validateOwnedCRDs)
}
func (tc *testContext) testODHDeployment(t *testing.T) {
- // Verify if the operator pod is running
+ // Verify if the operator deployment is created
require.NoErrorf(t, tc.waitForControllerDeployment("opendatahub-operator-controller-manager", 1),
"error in validating odh operator deployment")
}
func (tc *testContext) validateOwnedCRDs(t *testing.T) {
- // Verify if all the required CRDs are installed
+ // Verify if 2 operators CRDs are installed
require.NoErrorf(t, tc.validateCRD("datascienceclusters.datasciencecluster.opendatahub.io"),
"error in validating CRD : datascienceclusters.datasciencecluster.opendatahub.io")
require.NoErrorf(t, tc.validateCRD("dscinitializations.dscinitialization.opendatahub.io"),
"error in validating CRD : dscinitializations.dscinitialization.opendatahub.io")
+ // Verify if 4 dashabord required CRDs are installed
require.NoErrorf(t, tc.validateCRD("odhquickstarts.console.openshift.io"),
"error in validating CRD : odhquickstarts.console.openshift.io")