consolidate test jobs in ci

Author: t0mmylam

.github/workflows/operator-ci.yaml

@@ -47,14 +47,22 @@ env:
   PLATFORMS: linux/amd64,linux/arm64
 
 jobs:
-  # Test operator across supported Kubernetes versions
+  # Test operator across supported Kubernetes versions and test suites
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # Test on all supported K8s versions (matches docs/kubernetes-support.md)
+        # Standard E2E tests on all supported K8s versions
         k8s-version: ["1.31.12", "1.32.8", "1.33.4", "1.34.0"]
+        test-suite: ["e2e"]
+        include:
+          # Deployment policy tests on 15-node cluster (K8s 1.34 only)
+          - k8s-version: "1.34.0"
+            test-suite: deployment-policy
+            kind-config: k8s-tests/chainsaw/deployment-policy/kind-config.yaml
+            make-target: deployment-policy-tests
       fail-fast: false  # Continue testing other versions if one fails
+    name: ${{ matrix.test-suite }}-tests (k8s-${{ matrix.k8s-version }})
     steps:
       - uses: actions/checkout@v4
         with:
@@ -71,14 +79,14 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Kubernetes KinD Cluster v${{ matrix.k8s-version }}
+      - name: Create Kubernetes KinD Cluster v${{ matrix.k8s-version }}
         id: kind
         uses: helm/kind-action@v1
         with:
           version: v0.30.0
           node_image: kindest/node:v${{ matrix.k8s-version }}
-          config: operator/config/local-dev/kind-config.yaml
-          cluster_name: kind
+          config: ${{ matrix.kind-config || 'operator/config/local-dev/kind-config.yaml' }}
+          cluster_name: skyhook-test
       # Cache build tools and dependencies for faster builds
       - name: Restore cached Binaries
         id: cached-binaries
@@ -103,74 +111,21 @@ jobs:
           path: |
             ${{ github.workspace }}/operator/bin
             ~/.cache/go-build
-      # Run full test suite including e2e tests
-      - name: end-to-end-tests
+      # Run test suite
+      - name: Run ${{ matrix.test-suite }} tests
         run: |
           cd operator
-          make setup-kind-cluster
-          make test
-  
-  # Test deployment policies on 15-node cluster
-  deployment-policy-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-tags: true
-          fetch-depth: 0
-      - name: Setup Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          cache-dependency-path: operator/go.sum
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create 15-node Kind Cluster
-        id: kind
-        uses: helm/kind-action@v1
-        with:
-          version: v0.30.0
-          node_image: kindest/node:v1.34.0
-          config: k8s-tests/chainsaw/deployment-policy/kind-config.yaml
-          cluster_name: skyhook-dp-test
-      # Cache build tools and dependencies for faster builds
-      - name: Restore cached Binaries
-        id: cached-binaries
-        uses: actions/cache/restore@v4
-        with:
-          key: ${{ env.GO_VERSION }}-${{ runner.os }}-${{ runner.arch }}-bin-${{ hashFiles('operator/deps.mk') }}
-          restore-keys: ${{ env.GO_VERSION }}-${{ runner.os }}-${{ runner.arch }}-bin-
-          path: |
-            ${{ github.workspace }}/operator/bin
-            ~/.cache/go-build
-      - name: Install dependencies
-        if: steps.cached-binaries.outputs.cache-hit != 'true'
-        run: |
-          cd operator
-          make install-deps
-      - name: Save cached Binaries
-        id: save-cached-binaries
-        if: steps.cached-binaries.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          key: ${{ env.GO_VERSION }}-${{ runner.os }}-${{ runner.arch }}-bin-${{ hashFiles('operator/deps.mk') }}
-          path: |
-            ${{ github.workspace }}/operator/bin
-            ~/.cache/go-build
-      # Run deployment policy E2E tests
-      - name: deployment-policy-e2e-tests
-        run: |
-          cd operator
-          make deployment-policy-tests
+          if [ "${{ matrix.test-suite }}" = "e2e" ]; then
+            make setup-kind-cluster
+            make test
+          else
+            make ${{ matrix.make-target }}
+          fi
   
   # Build multi-platform container image and push to registry
   build-and-push-operator:
     runs-on: ubuntu-latest
-    needs: [tests, deployment-policy-tests] # Don't run the build and push if tests fail
+    needs: [tests] # Don't run the build and push if tests fail
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:
       contents: read