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

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 5cd8110923e Refactor : update all E2E test name (#23415)
5cd8110923e is described below

commit 5cd8110923e665af6b9131fab862e3afada69f97
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Mon Jan 9 12:22:25 2023 +0800

    Refactor : update all E2E test name (#23415)
---
 .github/workflows/e2e-agent.yml           |  2 +-
 .github/workflows/e2e-discovery.yml       |  2 +-
 .github/workflows/e2e-pipeline.yml        | 10 +++++-----
 .github/workflows/e2e-showprocesslist.yml |  2 +-
 .github/workflows/e2e-transaction.yml     |  6 +++---
 .github/workflows/e2e.yml                 |  6 +++---
 .github/workflows/nightly-e2e.yml         |  8 ++++----
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml
index e229d6be85d..353f6617abc 100644
--- a/.github/workflows/e2e-agent.yml
+++ b/.github/workflows/e2e-agent.yml
@@ -79,6 +79,6 @@ jobs:
             ${{ env.REPOSITORY_NAME }}-maven-third-party-
       - name: Build Project
         run: ./mvnw -B clean install -DskipITs -DskipTests
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: |
           ./mvnw -B clean install -f test/e2e/agent/plugins/${{ matrix.plugin 
}}/pom.xml -Dspotless.apply.skip=true -Pit.env.${{ matrix.plugin }}
diff --git a/.github/workflows/e2e-discovery.yml 
b/.github/workflows/e2e-discovery.yml
index ee154e5422a..f1178b2ae44 100644
--- a/.github/workflows/e2e-discovery.yml
+++ b/.github/workflows/e2e-discovery.yml
@@ -85,5 +85,5 @@ jobs:
           java-version: 8
       - name: Build Discovery IT image
         run: ./mvnw -B clean install -am -pl test/e2e/discovery 
-Pit.env.docker -DskipTests
-      - name: Run MySQL Discovery Integration Test
+      - name: Run MySQL Discovery E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/discovery/pom.xml 
-Dit.env.type=docker -Dit.docker.mysql.version=mysql:5.7
diff --git a/.github/workflows/e2e-pipeline.yml 
b/.github/workflows/e2e-pipeline.yml
index 117d643fe2a..f1b59e37001 100644
--- a/.github/workflows/e2e-pipeline.yml
+++ b/.github/workflows/e2e-pipeline.yml
@@ -99,9 +99,9 @@ jobs:
         run: ./mvnw -B clean install -am -pl test/e2e/pipeline -Pit.env.docker 
-DskipTests
       - name: Run Pipeline MySQL E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml 
-Dpipeline.it.env.type=docker -Dpipeline.it.docker.mysql.version=${{ 
env.mysql_version }}
-      - name: Run Pipeline PostgreSQL Integration Test
+      - name: Run Pipeline PostgreSQL E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml 
-Dpipeline.it.env.type=docker -Dpipeline.it.docker.postgresql.version=${{ 
env.postgresql_version }}
-      - name: Run Pipeline openGauss Integration Test
+      - name: Run Pipeline openGauss E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml 
-Dpipeline.it.env.type=docker -Dpipeline.it.docker.opengauss.version=${{ 
env.opengauss_version }}
 
   pipeline-daily-it-test:
@@ -130,9 +130,9 @@ jobs:
           java-version: 8
       - name: Build Pipeline IT image
         run: ./mvnw -B clean install -am -pl test/e2e/pipeline -Pit.env.docker 
-DskipTests
-      - name: Run Pipeline Daily MySQL Integration Test
+      - name: Run Pipeline Daily MySQL E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml 
-Dpipeline.it.env.type=docker -Dpipeline.it.docker.mysql.version=${{ 
env.mysql_version }}
-      - name: Run Pipeline Daily PostgreSQL Integration Test
+      - name: Run Pipeline Daily PostgreSQL E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml 
-Dpipeline.it.env.type=docker -Dpipeline.it.docker.postgresql.version=${{ 
env.postgresql_version }}
-      - name: Run Pipeline Daily openGauss Integration Test
+      - name: Run Pipeline Daily openGauss E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/pipeline/pom.xml 
-Dpipeline.it.env.type=docker -Dpipeline.it.docker.opengauss.version=${{ 
env.opengauss_version }}
diff --git a/.github/workflows/e2e-showprocesslist.yml 
b/.github/workflows/e2e-showprocesslist.yml
index 609844f6ffa..3947003fdfe 100644
--- a/.github/workflows/e2e-showprocesslist.yml
+++ b/.github/workflows/e2e-showprocesslist.yml
@@ -83,5 +83,5 @@ jobs:
           java-version: 8
       - name: Build ShowProcesslist IT image
         run: ./mvnw -B clean install -am -pl test/e2e/showprocesslist 
-Pit.env.docker -DskipTests
-      - name: Run MySQL ShowProcesslist Integration Test
+      - name: Run MySQL ShowProcesslist E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/showprocesslist/pom.xml 
-Dit.env.type=docker -Dit.scenarios=cluster_jdbc_proxy -Dit.run.modes=${{ 
matrix.mode }}
diff --git a/.github/workflows/e2e-transaction.yml 
b/.github/workflows/e2e-transaction.yml
index 1e933c3a209..e4385c67994 100644
--- a/.github/workflows/e2e-transaction.yml
+++ b/.github/workflows/e2e-transaction.yml
@@ -86,9 +86,9 @@ jobs:
           java-version: 8
       - name: Build Transaction IT image
         run: ./mvnw -B clean install -am -pl test/e2e/transaction 
-Pit.env.docker -DskipTests
-      - name: Run MySQL Transaction Integration Test
+      - name: Run MySQL Transaction E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/transaction/pom.xml 
-Dtransaction.it.env.type=docker -Dtransaction.it.env.transtypes=LOCAL,XA 
-Dtransaction.it.env.xa.providers=Atomikos,Narayana 
-Dtransaction.it.docker.mysql.version=${{ env.mysql_version }}
-      - name: Run PostgreSQL Transaction Integration Test
+      - name: Run PostgreSQL Transaction E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/transaction/pom.xml 
-Dtransaction.it.env.type=docker -Dtransaction.it.env.transtypes=LOCAL,XA 
-Dtransaction.it.env.xa.providers=Atomikos,Narayana 
-Dtransaction.it.docker.postgresql.version=${{ env.postgresql_version }}
-      - name: Run OpenGauss Transaction Integration Test
+      - name: Run OpenGauss Transaction E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/transaction/pom.xml 
-Dtransaction.it.env.type=docker -Dtransaction.it.env.transtypes=LOCAL,XA 
-Dtransaction.it.env.xa.providers=Atomikos,Narayana 
-Dtransaction.it.docker.opengauss.version=${{ env.opengauss_version }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 3500e21b5c9..4c4053bba4c 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -120,7 +120,7 @@ jobs:
       - name: Load IT image
         if: matrix.adapter == 'proxy'
         run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml 
-Dspotless.apply.skip=true -Dit.run.modes=Cluster -Dit.scenarios=${{ 
matrix.scenario }} -Dit.cluster.adapters=${{ matrix.adapter }} 
-Dit.cluster.databases=${{ matrix.database }} -Dit.cluster.env.type=DOCKER
 
   it-single-rule:
@@ -156,7 +156,7 @@ jobs:
       - name: Load IT image
         if: matrix.adapter == 'proxy'
         run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml 
-Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER 
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} 
-Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ 
matrix.scenario }}
 
   it-mixture-rule:
@@ -192,5 +192,5 @@ jobs:
       - name: Load IT image
         if: matrix.adapter == 'proxy'
         run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml 
-Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER 
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} 
-Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ 
matrix.scenario }}
diff --git a/.github/workflows/nightly-e2e.yml 
b/.github/workflows/nightly-e2e.yml
index 01d484c7ae4..6cbfbddebc6 100644
--- a/.github/workflows/nightly-e2e.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -95,7 +95,7 @@ jobs:
       - name: Load IT image
         if: matrix.adapter == 'proxy'
         run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml 
-Dspotless.apply.skip=true -Dit.run.modes=Cluster -Dit.scenarios=${{ 
matrix.scenario }} -Dit.cluster.adapters=${{ matrix.adapter }} 
-Dit.cluster.databases=${{ matrix.database }} -Dit.cluster.env.type=DOCKER
 
   it-single-rule:
@@ -133,7 +133,7 @@ jobs:
       - name: Load IT image
         if: matrix.adapter == 'proxy'
         run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml 
-Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER 
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} 
-Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ 
matrix.scenario }}
 
   it-mixture-rule:
@@ -171,7 +171,7 @@ jobs:
       - name: Load IT image
         if: matrix.adapter == 'proxy'
         run: docker load -i /tmp/${{ env.REPOSITORY_NAME }}-proxy-test.tar
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: ./mvnw -nsu -B install -f test/e2e/suite/pom.xml 
-Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER 
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }} 
-Dit.cluster.databases=${{ matrix.database }} -Dit.scenarios=${{ 
matrix.scenario }}
 
   mysql-proxy-agent:
@@ -193,7 +193,7 @@ jobs:
             ${{ env.REPOSITORY_NAME }}-maven-third-party-
       - name: Build Project
         run: ./mvnw -B clean install -DskipITs -DskipTests
-      - name: Run Integration Test
+      - name: Run E2E Test
         run: |
           ./mvnw -B clean install -f test/e2e/agent/plugins/metrics/pom.xml 
-Dspotless.apply.skip=true -Pit.env.metrics
           ./mvnw -B clean install -f 
test/e2e/agent/plugins/opentelemetry/pom.xml -Dspotless.apply.skip=true 
-Pit.env.opentelemetry

Reply via email to