CLOUDP-330231: Seggregate e2e2 nightly test matrix

Author: josvazg

.github/workflows/tests-e2e2.yaml

@@ -73,6 +73,8 @@ jobs:
           PR_LABELS: ${{ steps.get-labels.outputs.result || '["test/e2e2/*"]' }}
           E2E2_LABELS: ${{ env.e2e2_labels }}
           USE_JSON: true
+          SKIP_PREFIXES: "[\"nightly\"]"
+          NIGHTLY_MATRIX: "[\"nightly-core\",\"nightly-integration\"]"
         run: |
           # Nightly runs all tests, overriding PR labels as '["test/e2e2/*"]'
           if [ "${{ github.ref }}" == "refs/heads/main" ];then
@@ -82,7 +84,7 @@ jobs:
           echo PR_LABELS=${{ env.PR_LABELS }}
           echo E2E2_LABELS=${{ env.E2E2_LABELS }}
           if [ "${PR_LABELS}" == '["test/e2e2/*"]' ]; then
-            echo '{"e2e2":["all-e2e2-tests"]}' > result.json
+            echo '{"e2e2":${{ env.NIGHTLY_MATRIX }}}' > result.json
           else
             make compute-labels
             ./bin/ginkgo-labels > result.json
@@ -183,10 +185,6 @@ jobs:
         run: |
           echo "Using ENV: ${{ steps.select-env.outputs.ENV }}"
           label=${TEST_NAME}
-          if [ "${TEST_NAME}" == "all-e2e2-tests" ]; then
-            echo "Passing an empty label to run all tests"
-            label=""
-          fi
           devbox run -- make e2e2 label="${label}"          
 
       - name: Upload operator logs

test/e2e2/ako_test.go

@@ -37,7 +37,7 @@ const (
 	AtlasProjectCRDName = "atlasprojects.atlas.mongodb.com"
 )
 
-var _ = Describe("Atlas Operator Start and Stop test", Ordered, Label("ako-start-stop"), func() {
+var _ = Describe("Atlas Operator Start and Stop test", Ordered, Label("nightly-core", "ako-start-stop"), func() {
 	var ctx context.Context
 	var kubeClient client.Client
 	var ako operator.Operator

test/e2e2/all_in_one_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/kube"
 )
 
-var _ = Describe("all-in-one.yaml", Ordered, Label("all-in-one"), func() {
+var _ = Describe("all-in-one.yaml", Ordered, Label("nightly-core", "all-in-one"), func() {
 	var kubeClient client.Client
 
 	_ = BeforeAll(func() {

test/e2e2/integration_test.go

@@ -47,7 +47,7 @@ const (
 	AtlasThirdPartyIntegrationsCRDName = "atlasthirdpartyintegrations.atlas.mongodb.com"
 )
 
-var _ = Describe("Atlas Third-Party Integrations Controller", Ordered, Label("integrations-ctlr"), func() {
+var _ = Describe("Atlas Third-Party Integrations Controller", Ordered, Label("nightly-integration", "integrations-ctlr"), func() {
 	var ctx context.Context
 	var kubeClient client.Client
 	var ako operator.Operator

tools/compute-test-labels/main.go

@@ -24,10 +24,11 @@ import (
 )
 
 type labelSet struct {
-	prLabels   string
-	intLabels  string
-	e2eLabels  string
-	e2e2Labels string
+	prLabels     string
+	intLabels    string
+	e2eLabels    string
+	e2e2Labels   string
+	skipPrefixes string
 }
 
 func jsonDump(data interface{}) string {
@@ -86,11 +87,35 @@ func FilterLabelsContain(labels []string, substr string) []string {
 	return filtered
 }
 
+func SkipLabelsByPrefix(labels []string, skipPrefixes []string) []string {
+	if len(skipPrefixes) == 0 {
+		return labels
+	}
+	filtered := make([]string, 0, len(labels))
+	for _, label := range labels {
+		if hasSkipPrefix(label, skipPrefixes) {
+			continue
+		}
+		filtered = append(filtered, label)
+	}
+	return filtered
+}
+
+func hasSkipPrefix(label string, skipPrefixes []string) bool {
+	for _, skipPrefix := range skipPrefixes {
+		if strings.HasPrefix(label, skipPrefix) {
+			return true
+		}
+	}
+	return false
+}
+
 func computeTestLabels(out io.Writer, outputJSON bool, inputs *labelSet) error {
 	var labels []string
 	var intLabels []string
 	var e2eLabels []string
 	var e2e2Labels []string
+	var skipPrefixes []string
 
 	if err := json.Unmarshal([]byte(inputs.prLabels), &labels); err != nil {
 		return fmt.Errorf("Error parsing PR labels: %w", err)
@@ -110,10 +135,15 @@ func computeTestLabels(out io.Writer, outputJSON bool, inputs *labelSet) error {
 			return fmt.Errorf("Error parsing E2E2 tests labels: %w", err)
 		}
 	}
+	if len(inputs.skipPrefixes) > 0 {
+		if err := json.Unmarshal([]byte(inputs.skipPrefixes), &skipPrefixes); err != nil {
+			return fmt.Errorf("Error parsing Skip prefixes tests labels: %w", err)
+		}
+	}
 
-	matchedIntTests := MatchWildcards(labels, intLabels, "int")
-	matchedE2ETests := MatchWildcards(labels, e2eLabels, "e2e")
-	matchedE2E2Tests := MatchWildcards(labels, e2e2Labels, "e2e2")
+	matchedIntTests := MatchWildcards(labels, SkipLabelsByPrefix(intLabels, skipPrefixes), "int")
+	matchedE2ETests := MatchWildcards(labels, SkipLabelsByPrefix(e2eLabels, skipPrefixes), "e2e")
+	matchedE2E2Tests := MatchWildcards(labels, SkipLabelsByPrefix(e2e2Labels, skipPrefixes), "e2e2")
 	// These have to be executed in their own environment )
 	matchedE2EGovTests := FilterLabelsContain(matchedE2ETests, "atlas-gov")
 
@@ -143,10 +173,11 @@ func computeTestLabels(out io.Writer, outputJSON bool, inputs *labelSet) error {
 func main() {
 	useJSON := os.Getenv("USE_JSON") != ""
 	inputs := labelSet{
-		prLabels:   os.Getenv("PR_LABELS"),
-		intLabels:  os.Getenv("INT_LABELS"),
-		e2eLabels:  os.Getenv("E2E_LABELS"),
-		e2e2Labels: os.Getenv("E2E2_LABELS"),
+		prLabels:     os.Getenv("PR_LABELS"),
+		intLabels:    os.Getenv("INT_LABELS"),
+		e2eLabels:    os.Getenv("E2E_LABELS"),
+		e2e2Labels:   os.Getenv("E2E2_LABELS"),
+		skipPrefixes: os.Getenv("SKIP_PREFIXES"),
 	}
 	if err := computeTestLabels(os.Stdout, useJSON, &inputs); err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)