You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2023/10/08 13:29:52 UTC

[skywalking] 02/02: Revert "Disable Istio relative e2e (#11371)"

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch restore-tests
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit dd01738d0116335703e3d3284e614420634d7f14
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Oct 8 21:29:03 2023 +0800

    Revert "Disable Istio relative e2e (#11371)"
    
    This reverts commit bdfe6168ccd610b4c087634029028f51f569391d.
---
 .github/workflows/skywalking.yaml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
index 02c710e7ee..3d191220fb 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -560,13 +560,6 @@ jobs:
               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: Satellite
             config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
           - name: Auth
@@ -594,6 +587,11 @@ jobs:
           - name: MariaDB Prometheus and slowsql
             config: test/e2e-v2/cases/mariadb/mariadb-slowsql/e2e.yaml
 
+          - 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: Zipkin ES
             config: test/e2e-v2/cases/zipkin/es/e2e.yaml
           - name: Zipkin ES Sharding
@@ -840,9 +838,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;