splitted tier tests into tier1, tier2 and tier3 (#3229)

Author: CFSNM

tests/e2e/cfmap_deletion_test.go

@@ -58,7 +58,7 @@ func cfgMapDeletionTestSuite(t *testing.T) {
 func (tc *CfgMapDeletionTestCtx) ValidateDSCDeletionUsingConfigMap(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Tier1)
+	skipUnless(t, Tier3)
 
 	// Create or update the deletion config map
 	enableDeletion := "false"
@@ -89,7 +89,7 @@ func (tc *CfgMapDeletionTestCtx) ValidateDSCDeletionUsingConfigMap(t *testing.T)
 func (tc *CfgMapDeletionTestCtx) ValidateOwnedNamespacesAllExist(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Tier1)
+	skipUnless(t, Tier3)
 
 	// Ensure namespaces with the owned namespace label exist
 	tc.EnsureResourcesExist(

tests/e2e/controller_test.go

@@ -404,7 +404,11 @@ func TestMain(m *testing.M) {
 		"Specify when to delete DataScienceCluster, DSCInitialization, and controllers. Options: always, on-failure, never.")
 	checkEnvVarBindingError(viper.BindEnv("deletion-policy", viper.GetEnvPrefix()+"_DELETION_POLICY"))
 
-	pflag.String("tag", "All", "Tag to run tests for. Options: All, Smoke, Tier1")
+	tagNames := make([]string, 0, len(allowedTags))
+	for _, tag := range allowedTags {
+		tagNames = append(tagNames, string(tag))
+	}
+	pflag.String("tag", "All", "Tag to run tests for. Options: "+strings.Join(tagNames, ", "))
 	checkEnvVarBindingError(viper.BindEnv("tag", viper.GetEnvPrefix()+"_TAG"))
 
 	pflag.Bool("fail-fast-on-error", true, "fail fast on error")

tests/e2e/creation_test.go

@@ -35,6 +35,9 @@ type DSCTestCtx struct {
 func dscManagementTestSuite(t *testing.T) {
 	t.Helper()
 
+	// disruptive tests are only supported on tier3 clusters
+	skipUnless(t, Tier3)
+
 	// Initialize the test context.
 	tc, err := NewTestContext(t)
 	require.NoError(t, err, "Failed to initialize test context")
@@ -106,8 +109,6 @@ func dscWebhookTestSuite(t *testing.T) {
 func (tc *DSCTestCtx) ValidateOperatorsInstallation(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Smoke)
-
 	// Define operators to be installed.
 	operators := []Operator{
 		{nn: types.NamespacedName{Name: certManagerOpName, Namespace: certManagerOpNamespace}, skipOperatorGroup: false, globalOperatorGroup: true, channel: certManagerOpChannel},
@@ -123,8 +124,6 @@ func (tc *DSCTestCtx) ValidateOperatorsInstallation(t *testing.T) {
 func (tc *DSCTestCtx) ValidateResourcesCreation(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Smoke)
-
 	tc.EventuallyResourceCreatedOrUpdated(
 		WithObjectToCreate(CreateJobSetOperator()),
 		WithCondition(jq.Match(`.status.conditions[] | select(.type == "Available") | .status == "True"`)),
@@ -136,8 +135,6 @@ func (tc *DSCTestCtx) ValidateResourcesCreation(t *testing.T) {
 func (tc *DSCTestCtx) ValidateDSCICreation(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Smoke)
-
 	tc.EventuallyResourceCreatedOrUpdated(
 		WithObjectToCreate(CreateDSCI(tc.DSCInitializationNamespacedName.Name, tc.AppsNamespace, tc.MonitoringNamespace)),
 		WithCondition(jq.Match(`.status.phase == "%s"`, status.ConditionTypeReady)),
@@ -153,8 +150,6 @@ func (tc *DSCTestCtx) ValidateDSCICreation(t *testing.T) {
 func (tc *DSCTestCtx) ValidateDSCCreation(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Smoke)
-
 	tc.EventuallyResourceCreatedOrUpdated(
 		WithObjectToCreate(CreateDSC(tc.DataScienceClusterNamespacedName.Name, tc.WorkbenchesNamespace)),
 		WithCondition(jq.Match(`.status.phase == "%s"`, status.ConditionTypeReady)),

tests/e2e/deletion_test.go

@@ -39,7 +39,7 @@ func deletionTestSuite(t *testing.T) {
 func (tc *DeletionTestCtx) TestDSCDeletion(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Tier1)
+	skipUnless(t, Tier3)
 
 	// Delete the DataScienceCluster instance
 	tc.DeleteResource(WithMinimalObject(gvk.DataScienceCluster, tc.DataScienceClusterNamespacedName))
@@ -49,7 +49,7 @@ func (tc *DeletionTestCtx) TestDSCDeletion(t *testing.T) {
 func (tc *DeletionTestCtx) TestDSCIDeletion(t *testing.T) {
 	t.Helper()
 
-	skipUnless(t, Tier1)
+	skipUnless(t, Tier3)
 
 	// Delete the DSCInitialization instance
 	tc.DeleteResource(WithMinimalObject(gvk.DSCInitialization, tc.DSCInitializationNamespacedName))