Merge pull request #4768 from nojnhuh/ci

ref(e2e): move k8s version test config to CI

Author: nojnhuh

.github/workflows/main.yml

@@ -202,7 +202,16 @@ jobs:
     needs: build
     strategy:
       matrix:
+        k8s_version: [""]
+        focus: [""]
         bucket: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        include:
+          - k8s_version: v1.21.10
+            focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"
+            bucket: ".*"
+          - k8s_version: v1.22.7
+            focus: "Test traffic flowing from client to server with a Kubernetes Service for the Source: HTTP"
+            bucket: ".*"
     env:
       CTR_TAG: ${{ github.sha }}
       CTR_REGISTRY: "localhost:5000" # unused for kind, but currently required in framework
@@ -229,46 +238,31 @@ jobs:
         env:
           DOCKER_BUILDX_OUTPUT: type=docker
         run: make docker-build-osm build-osm docker-build-tcp-echo-server
-      # PR Tests
-      - name: Run PR tests
-        id: pr_test
-        if: ${{ github.event_name == 'pull_request' }}
+      - name: Run tests
+        id: test
         env:
           K8S_NAMESPACE: "osm-system"
-        run: go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\]'
+        run: go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -kindClusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
         continue-on-error: true
-      - name: Upload PR test logs
-        if: ${{ steps.pr_test.conclusion != 'skipped' }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: pr_test_logs_bucket_${{ matrix.bucket }}
-          path: /tmp/test**/*
-      - name: Check continue PR tests
-        if: ${{ steps.pr_test.conclusion != 'skipped' && steps.pr_test.outcome == 'failure'}}
-        run: exit 1
-      - name: Clean PR tests
-        if: ${{ steps.pr_test.conclusion != 'skipped' }}
-        run: rm -rf /tmp/test*
-
-      # Push Tests
-      - name: Run Push tests
-        id: push_test
-        if: ${{ github.event_name == 'push' }}
-        env:
-          K8S_NAMESPACE: "osm-system"
-        run: go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\]'
-        continue-on-error: true
-      - name: Upload Push test logs
-        if: ${{ steps.push_test.conclusion != 'skipped' }}
+      - name: Set Logs name
+        if: ${{ steps.test.conclusion != 'skipped' }}
+        run: |
+          if [[ -n "${{ matrix.k8s_version }}" ]]; then
+            echo "ARTIFACT_NAME=test_logs_k8s_version_${{ matrix.k8s_version }}" >> $GITHUB_ENV
+          else
+            echo "ARTIFACT_NAME=test_logs_bucket_${{ matrix.bucket }}" >> $GITHUB_ENV
+          fi
+      - name: Upload test logs
+        if: ${{ steps.test.conclusion != 'skipped' }}
         uses: actions/upload-artifact@v2
         with:
-          name: push_test_logs_bucket_${{ matrix.bucket }}
+          name: ${{ env.ARTIFACT_NAME }}
           path: /tmp/test**/*
-      - name: Check continue Push tests
-        if: ${{ steps.push_test.conclusion != 'skipped' && steps.push_test.outcome == 'failure'}}
+      - name: Check continue tests
+        if: ${{ steps.test.conclusion != 'skipped' && steps.test.outcome == 'failure'}}
         run: exit 1
-      - name: Clean Push tests logs
-        if: ${{ steps.push_test.conclusion != 'skipped' }}
+      - name: Clean tests
+        if: ${{ steps.test.conclusion != 'skipped' }}
         run: rm -rf /tmp/test*
 
   integration-tresor: