Combined

Signed-off-by: Tom Pantelis <[email protected]>

.github/workflows/e2e.yml

@@ -68,72 +68,42 @@ jobs:
       - name: Post mortem
         if: failure()
         uses: submariner-io/shipyard/gh-actions/post-mortem@devel
-  conformance-test-clusterset-ip:
+  conformance-test:
     name: MCS Conformance - clusterset IP enabled
     needs: images
-    timeout-minutes: 45
+    timeout-minutes: 60
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        using: [ 'clusterset-ip', '' ]
     steps:
       - name: Check out the repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
       - name: Check out the mcs-api repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
         with:
-          ref: b49dd40c93c8792a6ff54f648eea575d85636a3b
+          ref: e225cd7dd9d7040d0e03f3c45c415ba72ad8abdf
           repository: tpantelis/mcs-api
           path: mcs-api
 
       - name: Deploy Submariner
         shell: bash
         run: |
-          make deploy using="clusterset-ip"
+          make deploy using="${{ matrix.using }}"
 
       - name: Run conformance tests
         shell: bash
         run: |
           export KUBECONFIG=$(find $(git rev-parse --show-toplevel)/output/kubeconfigs/ -type f -printf %p:)
+          label_filter="Connectivity"
+          if [[ "${{ inputs.using }}" =~ "clusterset-ip" ]]; then
+                label_filter="Required || EndpointSlice || DNS"
+          fi
           cd mcs-api/conformance
           go test -v -timeout 30m -contexts cluster1,cluster2 -args -test.timeout 15m \
-              --ginkgo.v --ginkgo.trace --ginkgo.label-filter "Required || EndpointSlice || DNS"
-
-      - name: Print report.html
-        if: always()
-        shell: bash
-        run: |
-          cat mcs-api/conformance/report.html
-
-      - name: Post mortem
-        if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@devel
-  conformance-test-connectivity:
-    name: MCS Conformance - only connectivity
-    needs: images
-    timeout-minutes: 45
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-
-      - name: Check out the mcs-api repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-        with:
-          ref: b49dd40c93c8792a6ff54f648eea575d85636a3b
-          repository: tpantelis/mcs-api
-          path: mcs-api
-
-      - name: Deploy Submariner
-        shell: bash
-        run: |
-          make deploy
-
-      - name: Run conformance tests with Connectivity
-        shell: bash
-        run: |
-          export KUBECONFIG=$(find $(git rev-parse --show-toplevel)/output/kubeconfigs/ -type f -printf %p:)
-          cd mcs-api/conformance
-          go test -v -timeout 30m -contexts cluster1,cluster2 -args -test.timeout 15m \
-              --ginkgo.v --ginkgo.trace --ginkgo.label-filter "Connectivity"
+              --ginkgo.v --ginkgo.trace --ginkgo.label-filter "${label_filter}"
 
       - name: Print report.html
         if: always()