ShenYu Admin Cluster, cluster e2e

.github/workflows/e2e-k8s.yml

@@ -103,92 +103,6 @@ jobs:
           name: shenyu-images
           path: /tmp/apache-shenyu-*.tar
           retention-days: 1
-
-  e2e-cluster:
-    runs-on: ubuntu-latest
-    needs:
-      - changes
-      - build-docker-images
-    if: (github.repository == 'apache/shenyu' && ${{ needs.changes.outputs.e2e == 'true' }})
-    strategy:
-      matrix:
-        include:
-          - case: shenyu-e2e-case-cluster
-            script: e2e-cluster-jdbc
-          - case: shenyu-e2e-case-cluster
-            script: e2e-cluster-zookeeper
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Free disk space
-        run: |
-          df --human-readable
-          sudo apt clean
-          docker rmi $(docker image ls --all --quiet)
-          rm --recursive --force "$AGENT_TOOLSDIRECTORY"
-          df --human-readable
-          rm -rf /tmp/shenyu
-          mkdir -p /tmp/shenyu
-      
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: '.github/filters.yml'
-          list-files: json
-
-      - name: Install k8s
-        if: steps.filter.outputs.changed == 'true'
-        run: |
-          curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE=777 sh -
-          cat /etc/rancher/k3s/k3s.yaml
-          mkdir -p ~/.kube
-          cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
-      
-      - name: Set up JDK 17 for Building ShenYu
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Restore ShenYu Maven Repos
-        if: steps.filter.outputs.changed == 'true'
-        uses: actions/cache/restore@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      
-      - uses: actions/download-artifact@v3
-        with:
-          name: shenyu-images
-          path: /tmp/shenyu/
-
-      - name: Build k8s Cluster
-        if: steps.filter.outputs.changed == 'true'
-        run: |
-          sudo k3s ctr images import /tmp/shenyu/apache-shenyu-admin.tar
-          sudo k3s ctr images import /tmp/shenyu/apache-shenyu-bootstrap.tar
-      
-      #      - name: Setup Debug Session
-      #        uses: mxschmitt/action-tmate@v3
-      #        timeout-minutes: 15
-      #        with:
-      #          detached: true
-
-      - name: Run E2E Tests
-        if: steps.filter.outputs.changed == 'true'
-        run: |
-          bash ./shenyu-e2e/shenyu-e2e-case/${{ matrix.case }}/k8s/script/${{ matrix.script }}.sh
-      
-      - name: Cluster Test after Healthcheck
-        if: steps.filter.outputs.changed == 'true'
-        run: |
-          kubectl get all
-          kubectl get events --all-namespaces
-          kubectl logs -l app=shenyu-admin-mysql
 
   e2e-storage:
     runs-on: ubuntu-latest
@@ -294,6 +208,10 @@ jobs:
             script: e2e-grpc-sync
           - case: shenyu-e2e-case-websocket
             script: e2e-websocket-sync
+          - case: shenyu-e2e-case-cluster
+            script: e2e-cluster-jdbc
+          - case: shenyu-e2e-case-cluster
+            script: e2e-cluster-zookeeper
 
     steps:
       - uses: actions/checkout@v2
@@ -383,13 +301,11 @@ jobs:
     if: ${{ needs.changes.outputs.e2e == 'true' }}
     needs:
       - changes
-      - e2e-cluster
       - e2e-storage
       - e2e-case
     runs-on: ubuntu-latest
     steps:
       - name: checking job status
         run: |
-          [[ "${{ needs.e2e-cluster.result }}" == "success" ]] || exit -1
           [[ "${{ needs.e2e-storage.result }}" == "success" ]] || exit -1
           [[ "${{ needs.e2e-case.result }}" == "success" ]] || exit -1