This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 1925ed8 Fix it.adapters's value (#8960)
1925ed8 is described below
commit 1925ed8f14ff2c016be7a043ad32aa99c136d839
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 9 15:04:54 2021 +0800
Fix it.adapters's value (#8960)
* Fix it.adapters's value
* Revert test
---
.github/workflows/it.yml | 16 ++++++++--------
.../shardingsphere-integration-test-suite/pom.xml | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index a4f8e43..ef29202 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -25,7 +25,7 @@ on:
jobs:
mysql-proxy-db:
- name: MySQL-Proxy with DB scenario
+ name: MySQL-Proxy with DB
runs-on: ubuntu-latest
steps:
- name: Cache Maven Repos
@@ -43,10 +43,10 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true
-Djacoco.skip=true -DskipITs
- name: Run Integration Test
- run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.docker
-Dit.scenarios=proxy -Dit.scenarios=db -Dit.mysql.host=127.0.0.1
-Dit.mysql.port=33060
+ run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.env.docker
-Dit.adapters=proxy -Dit.scenarios=db -Dit.mysql.host=127.0.0.1
-Dit.mysql.port=33060
mysql-proxy-tbl:
- name: MySQL-Proxy with TBL scenario
+ name: MySQL-Proxy with TBL
runs-on: ubuntu-latest
steps:
- name: Cache Maven Repos
@@ -64,10 +64,10 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true
-Djacoco.skip=true -DskipITs
- name: Run Integration Test
- run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.docker
-Dit.scenarios=proxy -Dit.scenarios=tbl -Dit.mysql.host=127.0.0.1
-Dit.mysql.port=33060
+ run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.env.docker
-Dit.adapters=proxy -Dit.scenarios=tbl -Dit.mysql.host=127.0.0.1
-Dit.mysql.port=33060
mysql-proxy-repilca-query:
- name: MySQL-Proxy with REPLICA-QUERY scenario
+ name: MySQL-Proxy with REPLICA-QUERY
runs-on: ubuntu-latest
steps:
- name: Cache Maven Repos
@@ -85,10 +85,10 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true
-Djacoco.skip=true -DskipITs
- name: Run Integration Test
- run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.docker
-Dit.scenarios=proxy -Dit.scenarios=repilca_query -Dit.mysql.host=127.0.0.1
-Dit.mysql.port=33060
+ run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.env.docker
-Dit.adapters=proxy -Dit.scenarios=repilca_query -Dit.mysql.host=127.0.0.1
-Dit.mysql.port=33060
mysql-proxy-dbtbl-with-proxy-repilca-query:
- name: MySQL-Proxy with DBTBL-WITH-REPLICA-QUERY scenario
+ name: MySQL-Proxy with DBTBL-WITH-REPLICA-QUERY
runs-on: ubuntu-latest
steps:
- name: Cache Maven Repos
@@ -106,4 +106,4 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true
-Djacoco.skip=true -DskipITs
- name: Run Integration Test
- run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.docker
-Dit.scenarios=proxy -Dit.scenarios=dbtbl_with_repilca_query
-Dit.mysql.host=127.0.0.1 -Dit.mysql.port=33060
+ run: ./mvnw -B clean install -f
shardingsphere-test/shardingsphere-integration-test/pom.xml -Pit.env.docker
-Dit.adapters=proxy -Dit.scenarios=dbtbl_with_repilca_query
-Dit.mysql.host=127.0.0.1 -Dit.mysql.port=33060
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
index aed9ec7..55edb9e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
@@ -79,7 +79,7 @@
<profiles>
<profile>
- <id>it.docker</id>
+ <id>it.env.docker</id>
<build>
<plugins>
<plugin>