Restore Istio E2E and add system info when failed (apache#11387)

liangyepianzhou · Oct 28, 2023 · 0c0c205 · 0c0c205
1 parent bd5dce0
commit 0c0c205
Showing 1 changed file with 42 additions and 32 deletions.
diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
@@ -539,35 +539,31 @@ jobs:
           - name: Kafka Log
             config: test/e2e-v2/cases/kafka/log/e2e.yaml
 
-          # TODO, disable Istio relative e2e tests temporarily,
-          # due to 403 issue of images pulling
-          #- name: Istio Metrics Service 1.15.0
-          #  config: test/e2e-v2/cases/istio/metrics/e2e.yaml
-          #  env: |
-          #    ISTIO_VERSION=1.15.0
-          #    KUBERNETES_VERSION=25
-          #- name: Istio Metrics Service 1.16.0
-          #  config: test/e2e-v2/cases/istio/metrics/e2e.yaml
-          #  env: |
-          #    ISTIO_VERSION=1.16.0
-          #    KUBERNETES_VERSION=25
-          #- name: Istio Metrics Service 1.17.0
-          #  config: test/e2e-v2/cases/istio/metrics/e2e.yaml
-          #  env: |
-          #    ISTIO_VERSION=1.17.0
-          #    KUBERNETES_VERSION=25
-          #- name: Istio Metrics Service 1.18.0
-          #  config: test/e2e-v2/cases/istio/metrics/e2e.yaml
-          #  env: |
-          #    ISTIO_VERSION=1.18.0
-          #    KUBERNETES_VERSION=25
-
-          # TODO, disable Istio relative e2e tests temporarily,
-          # as they are blocked by the GHA resource limitation.
-          # - name: Rover with Istio Process 1.15.0
-          #   config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
-          #   env: ISTIO_VERSION=1.15.0
-          #   runs-on: ubuntu-20.04
+          - name: Istio Metrics Service 1.15.0
+            config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+            env: |
+              ISTIO_VERSION=1.15.0
+              KUBERNETES_VERSION=25
+          - name: Istio Metrics Service 1.16.0
+            config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+            env: |
+              ISTIO_VERSION=1.16.0
+              KUBERNETES_VERSION=25
+          - name: Istio Metrics Service 1.17.0
+            config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+            env: |
+              ISTIO_VERSION=1.17.0
+              KUBERNETES_VERSION=25
+          - name: Istio Metrics Service 1.18.0
+            config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+            env: |
+              ISTIO_VERSION=1.18.0
+              KUBERNETES_VERSION=25
+
+          - name: Rover with Istio Process 1.15.0
+            config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
+            env: ISTIO_VERSION=1.15.0
+            runs-on: ubuntu-20.04
 
           - name: Satellite
             config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
@@ -685,6 +681,12 @@ jobs:
         run: |
           find docker-images -name "*.tar" -exec docker load -i {} \;
           find docker-images -name "*.tar" -exec rm {} \;
+      - name: Login to ghcr
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache maven repository
         uses: actions/cache@v3
         with:
@@ -701,6 +703,11 @@ jobs:
         uses: apache/skywalking-infra-e2e@0a5b398fc9668ccb848b16e6da4f09180955dc3e
         with:
           e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
+      - if: ${{ failure() }}
+        run: |
+          df -h
+          du -sh .
+          docker images
       - uses: actions/upload-artifact@v2
         if: ${{ failure() }}
         name: Upload Logs
@@ -757,6 +764,11 @@ jobs:
           ALS_ANALYZER: ${{ matrix.analyzer }}
         with:
           e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/istio/als/e2e.yaml
+      - if: ${{ failure() }}
+        run: |
+          df -h
+          du -sh .
+          docker images
       - uses: actions/upload-artifact@v2
         if: ${{ failure() }}
         name: Upload Logs
@@ -844,9 +856,7 @@ jobs:
           [[ ${unitResults} == 'success' ]] || [[ ${execute} != 'true' && ${unitResults} == 'skipped' ]] || exit -3;
           [[ ${integrationResults} == 'success' ]] || [[ ${execute} != 'true' && ${integrationResults} == 'skipped' ]] || exit -4;
           [[ ${e2eResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eResults} == 'skipped' ]] || exit -5;
-          # TODO, disable Istio relative e2e tests temporarily,
-          # as they are blocked by the GHA resource limitation.
-          # [[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6;
+          [[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6;
           [[ ${e2eJavaVersionResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eJavaVersionResults} == 'skipped' ]] || exit -7;
           [[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8;