This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 ba96517dc05 Refactor operation e2e yml (#24767)
ba96517dc05 is described below
commit ba96517dc05167b879578e4073a5e5acc08b0804
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Mar 22 22:58:42 2023 +0800
Refactor operation e2e yml (#24767)
---
.github/workflows/e2e-discovery.yml | 16 ++++++++--------
.github/workflows/e2e-pipeline.yml | 22 +++++++++++-----------
.github/workflows/e2e-showprocesslist.yml | 12 ++++++------
.github/workflows/e2e-transaction.yml | 12 ++++++------
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/e2e-discovery.yml
b/.github/workflows/e2e-discovery.yml
index dc5a1f399bd..351b13b8496 100644
--- a/.github/workflows/e2e-discovery.yml
+++ b/.github/workflows/e2e-discovery.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: E2E - Discovery
+name: E2E - Database Discovery
on:
push:
@@ -51,7 +51,7 @@ on:
workflow_dispatch:
concurrency:
- group: it-discovery-${{ github.workflow }}-${{ github.ref }}
+ group: e2e-db-discovery-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
@@ -59,8 +59,8 @@ env:
REPOSITORY_NAME: shardingsphere
jobs:
- discovery-it-test:
- name: discovery-it-test
+ db-discovery:
+ name: E2E - Database Discovery
runs-on: ubuntu-latest
env:
mysql_version: 5.7
@@ -74,21 +74,21 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache${{
github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache${{
github.sha }}
restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache
${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
- - name: Build Discovery IT image
+ - name: Build Database Discovery E2E image
run: ./mvnw -B clean install -am -pl test/e2e/operation/discovery
-Pit.env.docker -DskipTests
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
- - name: Run MySQL Discovery E2E Test
+ - name: Run MySQL Database Discovery E2E Test
run: ./mvnw -nsu -B install -f test/e2e/operation/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 1fe8ff6f976..7b5eb52b0ce 100644
--- a/.github/workflows/e2e-pipeline.yml
+++ b/.github/workflows/e2e-pipeline.yml
@@ -63,7 +63,7 @@ on:
workflow_dispatch:
concurrency:
- group: it-pipeline-${{ github.workflow }}-${{ github.ref }}
+ group: e2e-pipeline-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
@@ -71,9 +71,9 @@ env:
REPOSITORY_NAME: shardingsphere
jobs:
- pipeline-it-test:
+ pipeline:
if: (github.event_name != 'schedule')
- name: pipeline-it-test
+ name: E2E - Pipeline
runs-on: ubuntu-latest
env:
postgresql_version: postgres:12-alpine
@@ -86,16 +86,16 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{
github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache-${{
github.sha }}
restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache-
${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
- - name: Build Pipeline IT image
+ - name: Build Pipeline E2E image
run: ./mvnw -B clean install -am -pl test/e2e/operation/pipeline
-Pit.env.docker -DskipTests
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
@@ -109,9 +109,9 @@ jobs:
- name: Run Pipeline openGauss E2E Test
run: ./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml
-Dpipeline.it.env.type=docker -Dpipeline.it.docker.opengauss.version=${{
env.opengauss_version }}
- pipeline-daily-it-test:
+ daily-pipeline:
if: (github.event_name == 'schedule' && github.repository ==
'apache/shardingsphere')
- name: pipeline-daily-it-test
+ name: Nightly - E2E - Pipeline
runs-on: ubuntu-latest
env:
postgresql_version:
postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
@@ -124,16 +124,16 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-${{
github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache-${{
github.sha }}
restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache-
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache-
${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
- - name: Build Pipeline IT image
+ - name: Build Pipeline E2E image
run: ./mvnw -B clean install -am -pl test/e2e/operation/pipeline
-Pit.env.docker -DskipTests
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
diff --git a/.github/workflows/e2e-showprocesslist.yml
b/.github/workflows/e2e-showprocesslist.yml
index a437a8612b4..48ea3e344ae 100644
--- a/.github/workflows/e2e-showprocesslist.yml
+++ b/.github/workflows/e2e-showprocesslist.yml
@@ -49,7 +49,7 @@ on:
workflow_dispatch:
concurrency:
- group: it-showprocesslist-${{ github.workflow }}-${{ github.ref }}
+ group: e2e-showprocesslist-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
@@ -57,8 +57,8 @@ env:
REPOSITORY_NAME: shardingsphere
jobs:
- showprocesslist-it-test:
- name: showprocesslist-it-test
+ show-process-list:
+ name: E2E - ShowProcesslist
runs-on: ubuntu-latest
env:
mysql_version: 5.7
@@ -72,16 +72,16 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache${{
github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache${{
github.sha }}
restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache
${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
- - name: Build ShowProcesslist IT image
+ - name: Build ShowProcesslist E2E image
run: ./mvnw -B clean install -am -pl
test/e2e/operation/showprocesslist -Pit.env.docker -DskipTests
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
diff --git a/.github/workflows/e2e-transaction.yml
b/.github/workflows/e2e-transaction.yml
index c8ac985bf20..a13ef6b6ef8 100644
--- a/.github/workflows/e2e-transaction.yml
+++ b/.github/workflows/e2e-transaction.yml
@@ -53,7 +53,7 @@ on:
workflow_dispatch:
concurrency:
- group: it-transaction-${{ github.workflow }}-${{ github.ref }}
+ group: e2e-transaction-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
@@ -61,8 +61,8 @@ env:
REPOSITORY_NAME: shardingsphere
jobs:
- transaction-it-test:
- name: transaction-it-test
+ transaction:
+ name: E2E - Transaction
runs-on: ubuntu-latest
env:
postgresql_version: postgres:12-alpine
@@ -75,16 +75,16 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
- key: ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache${{
github.sha }}
+ key: ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache${{
github.sha }}
restore-keys: |
- ${{ env.REPOSITORY_NAME }}-maven-third-party-it-cache
+ ${{ env.REPOSITORY_NAME }}-maven-third-party-e2e-cache
${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
- - name: Build Transaction IT image
+ - name: Build Transaction E2Egany image
run: ./mvnw -B clean install -am -pl test/e2e/operation/transaction
-Pit.env.docker -DskipTests
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
