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 70efdf7cdb7 Rename keys of properties from it to e2e (#36662)
70efdf7cdb7 is described below
commit 70efdf7cdb778fcc833355b8fea00a1c6a40b72c
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Sep 22 01:43:05 2025 +0800
Rename keys of properties from it to e2e (#36662)
---
.github/workflows/e2e-agent.yml | 6 +--
.github/workflows/e2e-operation.yml | 12 +++---
.github/workflows/e2e-sql.yml | 4 +-
.github/workflows/nightly-e2e-agent.yml | 6 +--
.github/workflows/nightly-e2e-operation.yml | 30 +++++++-------
.github/workflows/nightly-e2e-sql.yml | 4 +-
.../test-manual/integration-test/_index.cn.md | 46 +++++++++++-----------
.../test-manual/integration-test/_index.en.md | 40 +++++++++----------
.../test-manual/pipeline-e2e-test/_index.cn.md | 10 ++---
.../test-manual/pipeline-e2e-test/_index.en.md | 10 ++---
test/e2e/agent/engine/pom.xml | 4 +-
.../env/props/AgentE2ETestConfiguration.java | 12 +++---
.../src/test/resources/env/engine-env.properties | 10 ++---
.../src/test/resources/env/engine-env.properties | 12 +++---
.../src/test/resources/env/engine-env.properties | 12 +++---
.../src/test/resources/env/engine-env.properties | 12 +++---
.../env/container/util/AdapterContainerUtils.java | 2 +-
.../test/e2e/env/runtime/E2ETestEnvironment.java | 4 +-
.../e2e/env/runtime/type/ClusterEnvironment.java | 10 ++---
.../env/runtime/type/NativeStorageEnvironment.java | 8 ++--
.../test/e2e/env/runtime/type/RunEnvironment.java | 6 +--
test/e2e/fixture/pom.xml | 4 +-
.../pipeline/env/PipelineE2EEnvironment.java | 14 +++----
.../src/test/resources/env/e2e-env.properties | 46 +++++++++++-----------
.../env/ShowProcessListEnvironment.java | 8 ++--
.../src/test/resources/env/e2e-env.properties | 16 ++++----
.../transaction/env/TransactionE2EEnvironment.java | 26 ++++++------
.../src/test/resources/env/e2e-env.properties | 38 +++++++++---------
.../sql/src/test/resources/env/e2e-env.properties | 34 ++++++++--------
29 files changed, 223 insertions(+), 223 deletions(-)
diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml
index a335697cef8..118eff4ce4f 100644
--- a/.github/workflows/e2e-agent.yml
+++ b/.github/workflows/e2e-agent.yml
@@ -68,7 +68,7 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -DskipTests -Prelease,default-dep
- name: Build Proxy E2E Image
- run: ./mvnw clean install -DskipTests -Pit.env.proxy -f
test/e2e/agent/engine/pom.xml
+ run: ./mvnw clean install -DskipTests -Pe2e.env.proxy -f
test/e2e/agent/engine/pom.xml
- name: Save Proxy E2E Image
run: docker save -o /tmp/apache-shardingsphere-proxy-agent-test.tar
apache/shardingsphere-proxy-agent-test:latest
- uses: actions/upload-artifact@v4
@@ -77,7 +77,7 @@ jobs:
path: /tmp/apache-shardingsphere-proxy-agent-test.tar
retention-days: 10
- name: Build JDBC E2E Image
- run: ./mvnw clean install -DskipTests -Pit.env.jdbc -f
test/e2e/agent/engine/pom.xml
+ run: ./mvnw clean install -DskipTests -Pe2e.env.jdbc -f
test/e2e/agent/engine/pom.xml
- name: Save JDBC E2E Image
run: docker save -o /tmp/apache-shardingsphere-jdbc-agent-test.tar
apache/shardingsphere-jdbc-agent-test:latest
- uses: actions/upload-artifact@v4
@@ -154,4 +154,4 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -am -pl test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }} -DskipTests
- name: Run E2E Test
- run: ./mvnw -nsu -B clean install -f test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }}/pom.xml -Dit.env.adapter=${{
matrix.adapter }} -Dit.env.plugin=${{ matrix.plugin }}
+ run: ./mvnw -nsu -B clean install -f test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }}/pom.xml -De2e.env.adapter=${{
matrix.adapter }} -De2e.env.plugin=${{ matrix.plugin }}
diff --git a/.github/workflows/e2e-operation.yml
b/.github/workflows/e2e-operation.yml
index 39687c0aa72..e4efabae4e4 100644
--- a/.github/workflows/e2e-operation.yml
+++ b/.github/workflows/e2e-operation.yml
@@ -59,14 +59,14 @@ jobs:
fail-fast: false
matrix:
operation: [ transaction, pipeline, showprocesslist ]
- image: [ { type: "it.docker.mysql.version", version: "mysql:5.7" }, {
type: "it.docker.postgresql.version", version: "postgres:12-alpine" }, { type:
"it.docker.mariadb.version", version: "mariadb:11" } ]
+ image: [ { type: "e2e.docker.mysql.version", version: "mysql:5.7" }, {
type: "e2e.docker.postgresql.version", version: "postgres:12-alpine" }, { type:
"e2e.docker.mariadb.version", version: "mariadb:11" } ]
exclude:
- operation: transaction
- image: { type: "it.docker.mariadb.version", version: "mariadb:11" }
+ image: { type: "e2e.docker.mariadb.version", version: "mariadb:11"
}
- operation: showprocesslist
- image: { type: "it.docker.postgresql.version", version:
"postgres:12-alpine" }
+ image: { type: "e2e.docker.postgresql.version", version:
"postgres:12-alpine" }
- operation: showprocesslist
- image: { type: "it.docker.mariadb.version", version: "mariadb:11" }
+ image: { type: "e2e.docker.mariadb.version", version: "mariadb:11"
}
steps:
- env:
changed_operations: ${{
needs.detect-changed-files.outputs.changed_operations }}
@@ -104,7 +104,7 @@ jobs:
java-version: 11
- name: Build ${{ matrix.operation }} E2E Image
if: (env.skip_current_step == 'false')
- run: ./mvnw -B clean install -am -pl test/e2e/operation/${{
matrix.operation }} -Pit.env.docker -DskipTests
+ run: ./mvnw -B clean install -am -pl test/e2e/operation/${{
matrix.operation }} -Pe2e.env.docker -DskipTests
- name: Run ${{ matrix.operation }} on ${{ matrix.image.version }}
if: (env.skip_current_step == 'false')
- run: ./mvnw -nsu -B install -f test/e2e/operation/${{ matrix.operation
}}/pom.xml -D${{ matrix.operation }}.it.env.type=docker -D${{ matrix.operation
}}.${{ matrix.image.type }}=${{ matrix.image.version }}
+ run: ./mvnw -nsu -B install -f test/e2e/operation/${{ matrix.operation
}}/pom.xml -D${{ matrix.operation }}.e2e.env.type=docker -D${{ matrix.operation
}}.${{ matrix.image.type }}=${{ matrix.image.version }}
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index 520eaac2aab..fd759221868 100644
--- a/.github/workflows/e2e-sql.yml
+++ b/.github/workflows/e2e-sql.yml
@@ -70,7 +70,7 @@ jobs:
apache-shardingsphere-maven-third-party-e2e-cache-
apache-shardingsphere-maven-third-party-
- name: Build E2E Image
- run: ./mvnw -B clean install -am -pl test/e2e/sql -Pit.env.docker
-DskipTests -Dspotless.apply.skip=true
+ run: ./mvnw -B clean install -am -pl test/e2e/sql -Pe2e.env.docker
-DskipTests -Dspotless.apply.skip=true
- name: Save E2E Image
run: docker save -o /tmp/apache-shardingsphere-proxy-test.tar
apache/shardingsphere-proxy-test:latest
- uses: actions/upload-artifact@v4
@@ -135,4 +135,4 @@ jobs:
if: matrix.adapter == 'proxy'
run: docker load -i /tmp/apache-shardingsphere-proxy-test.tar
- name: Run E2E Test
- run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }}
-Dit.run.additional.cases=false -Dit.scenarios=${{ matrix.scenario }}
-Dit.cluster.databases=${{ matrix.database }} ${{ matrix.additional-options }}
+ run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -De2e.cluster.env.type=DOCKER
-De2e.cluster.adapters=${{ matrix.adapter }} -De2e.run.modes=${{ matrix.mode }}
-De2e.run.additional.cases=false -De2e.scenarios=${{ matrix.scenario }}
-De2e.cluster.databases=${{ matrix.database }} ${{ matrix.additional-options }}
diff --git a/.github/workflows/nightly-e2e-agent.yml
b/.github/workflows/nightly-e2e-agent.yml
index ff6809e16a3..fe96882f507 100644
--- a/.github/workflows/nightly-e2e-agent.yml
+++ b/.github/workflows/nightly-e2e-agent.yml
@@ -56,7 +56,7 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -DskipTests -Prelease,default-dep
- name: Build Proxy E2E Image
- run: ./mvnw clean install -DskipTests -Pit.env.proxy -f
test/e2e/agent/engine/pom.xml
+ run: ./mvnw clean install -DskipTests -Pe2e.env.proxy -f
test/e2e/agent/engine/pom.xml
- name: Save Proxy E2E Image
run: docker save -o /tmp/apache-shardingsphere-proxy-agent-test.tar
apache/shardingsphere-proxy-agent-test:latest
- uses: actions/upload-artifact@v4
@@ -65,7 +65,7 @@ jobs:
path: /tmp/apache-shardingsphere-proxy-agent-test.tar
retention-days: 10
- name: Build JDBC E2E Image
- run: ./mvnw clean install -DskipTests -Pit.env.jdbc -f
test/e2e/agent/engine/pom.xml
+ run: ./mvnw clean install -DskipTests -Pe2e.env.jdbc -f
test/e2e/agent/engine/pom.xml
- name: Save JDBC E2E Image
run: docker save -o /tmp/apache-shardingsphere-jdbc-agent-test.tar
apache/shardingsphere-jdbc-agent-test:latest
- uses: actions/upload-artifact@v4
@@ -142,4 +142,4 @@ jobs:
- name: Build Project
run: ./mvnw -B clean install -am -pl test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }} -DskipTests
- name: Run E2E Test
- run: ./mvnw -nsu -B clean install -f test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }}/pom.xml -Dit.env.adapter=${{
matrix.adapter }} -Dit.env.plugin=${{ matrix.plugin }}
+ run: ./mvnw -nsu -B clean install -f test/e2e/agent/plugins/${{
matrix.feature }}/${{ matrix.plugin }}/pom.xml -De2e.env.adapter=${{
matrix.adapter }} -De2e.env.plugin=${{ matrix.plugin }}
diff --git a/.github/workflows/nightly-e2e-operation.yml
b/.github/workflows/nightly-e2e-operation.yml
index e3ea049f3b6..faa4ee98cf7 100644
--- a/.github/workflows/nightly-e2e-operation.yml
+++ b/.github/workflows/nightly-e2e-operation.yml
@@ -47,25 +47,25 @@ jobs:
java-version: [ 11, 21 ]
operation: [ transaction, pipeline, showprocesslist ]
image: [
- { type: "it.docker.mysql.version", version: "mysql:5.7" },
- { type: "it.docker.mysql.version", version: "mysql:8.0" },
- { type: "it.docker.mariadb.version", version: "mariadb:11" },
- { type: "it.docker.postgresql.version", version:
"postgres:11-alpine" },
- { type: "it.docker.postgresql.version", version:
"postgres:12-alpine" },
- { type: "it.docker.postgresql.version", version:
"postgres:13-alpine" },
- { type: "it.docker.postgresql.version", version:
"postgres:14-alpine" },
- { type: "it.docker.opengauss.version", version:
"enmotech/opengauss:2.1.0" },
- { type: "it.docker.opengauss.version", version:
"enmotech/opengauss:3.0.0" }
+ { type: "e2e.docker.mysql.version", version: "mysql:5.7" },
+ { type: "e2e.docker.mysql.version", version: "mysql:8.0" },
+ { type: "e2e.docker.mariadb.version", version: "mariadb:11" },
+ { type: "e2e.docker.postgresql.version", version:
"postgres:11-alpine" },
+ { type: "e2e.docker.postgresql.version", version:
"postgres:12-alpine" },
+ { type: "e2e.docker.postgresql.version", version:
"postgres:13-alpine" },
+ { type: "e2e.docker.postgresql.version", version:
"postgres:14-alpine" },
+ { type: "e2e.docker.opengauss.version", version:
"enmotech/opengauss:2.1.0" },
+ { type: "e2e.docker.opengauss.version", version:
"enmotech/opengauss:3.0.0" }
]
exclude:
- operation: transaction
- image: { type: "it.docker.mariadb.version", version: "mariadb:11" }
+ image: { type: "e2e.docker.mariadb.version", version: "mariadb:11"
}
- operation: showprocesslist
- image: { type: "it.docker.mariadb.version", version: "mariadb:11" }
+ image: { type: "e2e.docker.mariadb.version", version: "mariadb:11"
}
- operation: showprocesslist
- image: { type: "it.docker.postgresql.version", version:
"postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine"
}
+ image: { type: "e2e.docker.postgresql.version", version:
"postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine"
}
- operation: showprocesslist
- image: { type: "it.docker.opengauss.version", version:
"enmotech/opengauss:2.1.0,enmotech/opengauss:3.0.0" }
+ image: { type: "e2e.docker.opengauss.version", version:
"enmotech/opengauss:2.1.0,enmotech/opengauss:3.0.0" }
steps:
- uses: actions/checkout@v4
- name: Retrieve Maven Caches
@@ -82,6 +82,6 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java-version }}
- name: Build ${{ matrix.operation }} E2E Image
- run: ./mvnw -B clean install -am -pl test/e2e/operation/${{
matrix.operation }} -Pit.env.docker -DskipTests
+ run: ./mvnw -B clean install -am -pl test/e2e/operation/${{
matrix.operation }} -Pe2e.env.docker -DskipTests
- name: Run ${{ matrix.operation }} on ${{ matrix.image.version }}
- run: ./mvnw -nsu -B install -f test/e2e/operation/${{ matrix.operation
}}/pom.xml -D${{ matrix.operation }}.it.env.type=docker -D${{ matrix.operation
}}.${{ matrix.image.type }}=${{ matrix.image.version }}
+ run: ./mvnw -nsu -B install -f test/e2e/operation/${{ matrix.operation
}}/pom.xml -D${{ matrix.operation }}.e2e.env.type=docker -D${{ matrix.operation
}}.${{ matrix.image.type }}=${{ matrix.image.version }}
diff --git a/.github/workflows/nightly-e2e-sql.yml
b/.github/workflows/nightly-e2e-sql.yml
index 21410e412e3..50422bf90bb 100644
--- a/.github/workflows/nightly-e2e-sql.yml
+++ b/.github/workflows/nightly-e2e-sql.yml
@@ -54,7 +54,7 @@ jobs:
${{ needs.global-environment.outputs.GLOBAL_CACHE_PREFIX
}}-maven-third-party-e2e-cache-
${{ needs.global-environment.outputs.GLOBAL_CACHE_PREFIX
}}-maven-third-party-
- name: Build E2E Image
- run: ./mvnw -B clean install -am -pl test/e2e/sql -Pit.env.docker
-DskipTests -Dspotless.apply.skip=true
+ run: ./mvnw -B clean install -am -pl test/e2e/sql -Pe2e.env.docker
-DskipTests -Dspotless.apply.skip=true
- name: Save E2E Image
run: docker save -o /tmp/${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-proxy-test.tar
apache/shardingsphere-proxy-test:latest
- uses: actions/upload-artifact@v4
@@ -122,4 +122,4 @@ jobs:
if: matrix.adapter == 'proxy'
run: docker load -i /tmp/${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}-proxy-test.tar
- name: Run E2E Test
- run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -Dit.cluster.env.type=DOCKER
-Dit.cluster.adapters=${{ matrix.adapter }} -Dit.run.modes=${{ matrix.mode }}
-Dit.run.additional.cases=false -Dit.scenarios=${{ matrix.scenario }}
-Dit.cluster.databases=${{ matrix.database }} ${{ matrix.additional-options }}
+ run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -De2e.cluster.env.type=DOCKER
-De2e.cluster.adapters=${{ matrix.adapter }} -De2e.run.modes=${{ matrix.mode }}
-De2e.run.additional.cases=false -De2e.scenarios=${{ matrix.scenario }}
-De2e.cluster.databases=${{ matrix.database }} ${{ matrix.additional-options }}
diff --git a/docs/document/content/test-manual/integration-test/_index.cn.md
b/docs/document/content/test-manual/integration-test/_index.cn.md
index 8eaa69154bd..1131c28382f 100644
--- a/docs/document/content/test-manual/integration-test/_index.cn.md
+++ b/docs/document/content/test-manual/integration-test/_index.cn.md
@@ -104,20 +104,20 @@ SQL 用例在
`resources/cases/${SQL-TYPE}/e2e-${SQL-TYPE}-${cases-description}.
#### Native 环境配置
-修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`it.cluster.env.type` 为 `NATIVE` 模式，然后修改如下的属性为本地数据库地址和账号。
+修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`e2e.cluster.env.type` 为 `NATIVE` 模式，然后修改如下的属性为本地数据库地址和账号。
```properties
-it.native.storage.host=127.0.0.1
-it.native.storage.port=3306
-it.native.storage.username=root
-it.native.storage.password=123456
+e2e.native.storage.host=127.0.0.1
+e2e.native.storage.port=3306
+e2e.native.storage.username=root
+e2e.native.storage.password=123456
```
修改完成后，可以再调整 `e2e-env.properties` 中其他属性，测试 ShardingSphere 的 Proxy、JDBC
接入端，或者测试单机、集群模式。
#### Docker 环境配置
-修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`it.cluster.env.type` 为 `DOCKER` 模式，如果执行 Proxy 接入端测试，需要执行如下的命令打包 Proxy 镜像。
+修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`e2e.cluster.env.type` 为 `DOCKER` 模式，如果执行 Proxy 接入端测试，需要执行如下的命令打包 Proxy 镜像。
```bash
./mvnw -B clean install -am -pl test/e2e/sql -Pit.env.docker -DskipTests
-Dspotless.apply.skip=true -Drat.skip=true
@@ -147,35 +147,35 @@ export DOCKER_HOST=tcp://127.0.0.1:2375
所有的属性值都可以通过 Maven 命令行 `-D` 的方式动态注入。
```properties
-# 运行模式，多个值可用逗号分隔。可选值：Standalone, Cluster
-it.run.modes=Cluster
-
# 场景类型，多个值可用逗号分隔。可选值：db, tbl, dbtbl_with_replica_query, replica_query
-it.scenarios=db,tbl,dbtbl_with_replica_query,replica_query
+e2e.scenarios=db,tbl,dbtbl_with_replica_query,replica_query
# 是否运行附加测试用例
-it.run.additional.cases=false
+e2e.run.additional.cases=false
# 是否运行冒烟测试
-it.run.smoke.cases=false
+e2e.run.smoke.cases=false
+
+# 运行模式，多个值可用逗号分隔。可选值：Standalone, Cluster
+e2e.run.modes=Cluster
# 配置环境类型，只支持单值。可选值：DOCKER, NATIVE
-it.cluster.env.type=${it.env}
+e2e.cluster.env.type=${e2e.env}
# 待测试的接入端类型，多个值可用逗号分隔。可选值：jdbc, proxy, 默认值：jdbc
-it.cluster.adapters=jdbc
+e2e.cluster.adapters=jdbc
# 场景类型，多个值可用逗号分隔。可选值：H2, MySQL, PostgreSQL，openGauss
-it.cluster.databases=H2,MySQL,PostgreSQL,openGauss
+e2e.cluster.databases=H2,MySQL,PostgreSQL,openGauss
# 测试数据库的镜像版本
-it.cluster.database.mysql.image=mysql:8.2.0
+e2e.cluster.database.mysql.image=mysql:8.2.0
# NATIVE 模式下数据库连接信息及账号
-it.native.storage.host=127.0.0.1
-it.native.storage.port=3306
-it.native.storage.username=root
-it.native.storage.password=123456
+e2e.native.storage.host=127.0.0.1
+e2e.native.storage.port=3306
+e2e.native.storage.username=root
+e2e.native.storage.password=123456
```
#### 运行调试模式
@@ -188,19 +188,19 @@ it.native.storage.password=123456
- 附加测试引擎
运行
`org.apache.shardingsphere.test.e2e.it.sql.${SQL-TYPE}.Additional${SQL-TYPE}E2EIT`
以启动使用更多 JDBC 方法调用的测试引擎。
- 附加测试引擎需要通过设置 `it.run.additional.cases=true` 开启。
+ 附加测试引擎需要通过设置 `e2e.run.additional.cases=true` 开启。
#### 运行 Docker 模式
```bash
-./mvnw -B clean install -f test/e2e/pom.xml -Pit.env.docker
-Dit.cluster.adapters=proxy,jdbc
-Dit.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-Dit.cluster.databases=MySQL
+./mvnw -B clean install -f test/e2e/pom.xml -Pit.env.docker
-De2e.cluster.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.cluster.databases=MySQL
```
运行以上命令会构建出一个用于集成测试的 Docker 镜像 `apache/shardingsphere-proxy-test:latest`。
如果仅修改了测试代码，可以复用已有的测试镜像，无须重新构建。使用以下命令可以跳过镜像构建，直接运行集成测试：
```bash
-./mvnw -B clean install -f test/e2e/sql/pom.xml -Pit.env.docker
-Dit.cluster.adapters=proxy,jdbc
-Dit.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-Dit.cluster.databases=MySQL
+./mvnw -B clean install -f test/e2e/sql/pom.xml -Pit.env.docker
-De2e.cluster.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.cluster.databases=MySQL
```
#### 远程 debug Docker 容器中的 Proxy 代码
diff --git a/docs/document/content/test-manual/integration-test/_index.en.md
b/docs/document/content/test-manual/integration-test/_index.en.md
index e93890f79ad..82086f6a13f 100644
--- a/docs/document/content/test-manual/integration-test/_index.en.md
+++ b/docs/document/content/test-manual/integration-test/_index.en.md
@@ -106,20 +106,20 @@ The assertion file format is as follows:
#### Native environment configuration
-Modify `it.cluster.env.type` in `src/test/resources/env/e2e-env.properties`
file of `e2e-sql` module to `NATIVE` mode, and then modify the following
properties to the local database address and account.
+Modify `e2e.cluster.env.type` in `src/test/resources/env/e2e-env.properties`
file of `e2e-sql` module to `NATIVE` mode, and then modify the following
properties to the local database address and account.
```properties
-it.native.storage.host=127.0.0.1
-it.native.storage.port=3306
-it.native.storage.username=root
-it.native.storage.password=123456
+e2e.native.storage.host=127.0.0.1
+e2e.native.storage.port=3306
+e2e.native.storage.username=root
+e2e.native.storage.password=123456
```
After the modification is completed, you can adjust other properties in
`e2e-env.properties` to test ShardingSphere's Proxy, JDBC access terminal, or
test the stand-alone and cluster modes.
#### Docker environment configuration
-Modify `it.cluster.env.type` in the
`src/test/resources/env/e2e-env.properties` file of the `e2e-sql` module to
`DOCKER` mode. If you perform a Proxy access end test, you need to execute the
following command to package the Proxy image.
+Modify `e2e.cluster.env.type` in the
`src/test/resources/env/e2e-env.properties` file of the `e2e-sql` module to
`DOCKER` mode. If you perform a Proxy access end test, you need to execute the
following command to package the Proxy image.
```bash
./mvnw -B clean install -am -pl test/e2e/sql -Pit.env.docker -DskipTests
-Dspotless.apply.skip=true -Drat.skip=true
@@ -149,31 +149,31 @@ All attribute values can be dynamically injected via
Maven command line `-D`.
```properties
# Scenario type. Multiple values can be separated by commas. Optional values:
db, tbl, dbtbl_with_replica_query, replica_query
-it.scenarios=db,tbl,dbtbl_with_replica_query,replica_query
+e2e.scenarios=db,tbl,dbtbl_with_replica_query,replica_query
# Whether to run additional test cases
-it.run.additional.cases=false
+e2e.run.additional.cases=false
# Whether to run smoke test
-it.run.smoke.cases=false
+e2e.run.smoke.cases=false
# Configure the environment type. Only one value is supported. Optional value:
DOCKER, NATIVE
-it.cluster.env.type=${it.env}
+e2e.cluster.env.type=${e2e.env}
# Access port types to be tested. Multiple values can be separated by commas.
Optional value: jdbc, proxy. The default value: jdbc
-it.cluster.adapters=jdbc
+e2e.cluster.adapters=jdbc
# Scenario type. Multiple values can be separated by commas. Optional value:
H2, MySQL, PostgreSQL, openGauss
-it.cluster.databases=H2,MySQL,PostgreSQL,openGauss
+e2e.cluster.databases=H2,MySQL,PostgreSQL,openGauss
# The mirror version of the database
-it.cluster.database.mysql.image=mysql:8.2.0
+e2e.cluster.database.mysql.image=mysql:8.2.0
# Database connection information and account in NATIVE mode
-it.native.storage.host=127.0.0.1
-it.native.storage.port=3306
-it.native.storage.username=root
-it.native.storage.password=123456
+e2e.native.storage.host=127.0.0.1
+e2e.native.storage.port=3306
+e2e.native.storage.username=root
+e2e.native.storage.password=123456
```
#### Run debugging mode
@@ -186,18 +186,18 @@ it.native.storage.password=123456
- Additional test engine
Run
`org.apache.shardingsphere.test.e2e.it.sql.${SQL-TYPE}.Additional${SQL-TYPE}E2EIT`
to start the test engine with more JDBC method calls.
- Additional test engines need to be enabled by setting
`it.run.additional.cases=true`.
+ Additional test engines need to be enabled by setting
`e2e.run.additional.cases=true`.
#### Run Docker mode
```bash
-./mvnw -B clean install -f test/e2e/pom.xml -Pit.env.docker
-Dit.cluster.adapters=proxy,jdbc
-Dit.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-Dit.cluster.databases=MySQL
+./mvnw -B clean install -f test/e2e/pom.xml -Pit.env.docker
-De2e.cluster.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.cluster.databases=MySQL
```
Run the above command to build a Docker mirror
`apache/shardingsphere-proxy-test:latest` used for integration testing.
If you only modify the test code, you can reuse the existing test mirror
without rebuilding it. Skip the mirror building and run the integration testing
directly with the following command:
```bash
-./mvnw -B clean install -f test/e2e/sql/pom.xml -Pit.env.docker
-Dit.cluster.adapters=proxy,jdbc
-Dit.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-Dit.cluster.databases=MySQL
+./mvnw -B clean install -f test/e2e/sql/pom.xml -Pit.env.docker
-De2e.cluster.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.cluster.databases=MySQL
```
#### Remote debug Proxy code in Docker container
diff --git a/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
b/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
index bfc792c0483..fea1a4c206c 100644
--- a/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
+++ b/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
@@ -62,11 +62,11 @@ Proxy 配置可以参考：
3. 以 MySQL 为例，`e2e-env.properties` 可以配置如下：
```
-pipeline.it.env.type=NATIVE
-pipeline.it.native.database=mysql
-pipeline.it.native.mysql.username=root
-pipeline.it.native.mysql.password=root
-pipeline.it.native.mysql.port=3306
+pipeline.e2e.env.type=NATIVE
+pipeline.e2e.native.database=mysql
+pipeline.e2e.native.mysql.username=root
+pipeline.e2e.native.mysql.password=root
+pipeline.e2e.native.mysql.port=3306
```
4. 找到对应的测试类，在 IDE 启动运行。
diff --git a/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
b/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
index 7073b825ed6..ff7d7a08cbe 100644
--- a/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
+++ b/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
@@ -61,11 +61,11 @@ Refer to following files for proxy `global.yaml`
configuration:
3. Take MySQL as an example, `e2e-env.properties` could be configured as
follows:
```
-pipeline.it.env.type=NATIVE
-pipeline.it.native.database=mysql
-pipeline.it.native.mysql.username=root
-pipeline.it.native.mysql.password=root
-pipeline.it.native.mysql.port=3306
+pipeline.e2e.env.type=NATIVE
+pipeline.e2e.native.database=mysql
+pipeline.e2e.native.mysql.username=root
+pipeline.e2e.native.mysql.password=root
+pipeline.e2e.native.mysql.port=3306
```
4. Find test class and start it on IDE.
diff --git a/test/e2e/agent/engine/pom.xml b/test/e2e/agent/engine/pom.xml
index a8f1713d6c7..93090df158b 100644
--- a/test/e2e/agent/engine/pom.xml
+++ b/test/e2e/agent/engine/pom.xml
@@ -71,7 +71,7 @@
<profiles>
<profile>
- <id>it.env.proxy</id>
+ <id>e2e.env.proxy</id>
<build>
<plugins>
<plugin>
@@ -130,7 +130,7 @@
</profile>
<profile>
- <id>it.env.jdbc</id>
+ <id>e2e.env.jdbc</id>
<build>
<plugins>
<plugin>
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/props/AgentE2ETestConfiguration.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/props/AgentE2ETestConfiguration.java
index bcc0792aa98..fd30e16e66f 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/props/AgentE2ETestConfiguration.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/props/AgentE2ETestConfiguration.java
@@ -44,12 +44,12 @@ public final class AgentE2ETestConfiguration {
private AgentE2ETestConfiguration() {
Properties envProps =
AgentE2EEnvironmentProperties.loadProperties("env/engine-env.properties");
- adapter = envProps.getProperty("it.env.adapter");
- pluginType = envProps.getProperty("it.env.plugin.type");
- pluginImageName = envProps.getProperty("it.env.plugin.image");
- logEnabled =
Boolean.parseBoolean(envProps.getProperty("it.env.log.enabled",
Boolean.FALSE.toString()));
- defaultExposePort =
Integer.parseInt(envProps.getProperty("it.env.plugin.default.expose.port",
"0"));
- collectDataWaitSeconds =
Long.parseLong(envProps.getProperty("it.env.collect.data.wait.seconds", "0"));
+ adapter = envProps.getProperty("e2e.env.adapter");
+ pluginType = envProps.getProperty("e2e.env.plugin.type");
+ pluginImageName = envProps.getProperty("e2e.env.plugin.image");
+ logEnabled =
Boolean.parseBoolean(envProps.getProperty("e2e.env.log.enabled",
Boolean.FALSE.toString()));
+ defaultExposePort =
Integer.parseInt(envProps.getProperty("e2e.env.plugin.default.expose.port",
"0"));
+ collectDataWaitSeconds =
Long.parseLong(envProps.getProperty("e2e.env.collect.data.wait.seconds", "0"));
}
/**
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
index 39a1bdbea6c..1b52edefb82 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=
-it.env.log.enabled=true
-it.env.plugin.type=file
-it.env.collect.data.wait.seconds=15
+# The value of e2e.env.adapter is proxy or jdbc
+e2e.env.adapter=
+e2e.env.log.enabled=true
+e2e.env.plugin.type=file
+e2e.env.collect.data.wait.seconds=15
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
index 759e123985b..3e8289cebdc 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
@@ -15,9 +15,9 @@
# limitations under the License.
#
-# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=
-it.env.plugin.type=prometheus
-it.env.plugin.image=prom/prometheus:v2.41.0
-it.env.plugin.default.expose.port=9090
-it.env.collect.data.wait.seconds=35
+# The value of e2e.env.adapter is proxy or jdbc
+e2e.env.adapter=
+e2e.env.plugin.type=prometheus
+e2e.env.plugin.image=prom/prometheus:v2.41.0
+e2e.env.plugin.default.expose.port=9090
+e2e.env.collect.data.wait.seconds=35
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
index 7c612a8aeb0..cf307219951 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
@@ -15,9 +15,9 @@
# limitations under the License.
#
-# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=
-it.env.plugin.type=jaeger
-it.env.plugin.image=jaegertracing/all-in-one:1.41
-it.env.plugin.default.expose.port=16686
-it.env.collect.data.wait.seconds=15
+# The value of e2e.env.adapter is proxy or jdbc
+e2e.env.adapter=
+e2e.env.plugin.type=jaeger
+e2e.env.plugin.image=jaegertracing/all-in-one:1.41
+e2e.env.plugin.default.expose.port=16686
+e2e.env.collect.data.wait.seconds=15
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
index d65db423fc5..dcfdda9c210 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
@@ -15,9 +15,9 @@
# limitations under the License.
#
-# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=
-it.env.plugin.type=zipkin
-it.env.plugin.image=openzipkin/zipkin:3.2
-it.env.plugin.default.expose.port=9411
-it.env.collect.data.wait.seconds=15
+# The value of e2e.env.adapter is proxy or jdbc
+e2e.env.adapter=
+e2e.env.plugin.type=zipkin
+e2e.env.plugin.image=openzipkin/zipkin:3.2
+e2e.env.plugin.default.expose.port=9411
+e2e.env.collect.data.wait.seconds=15
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/AdapterContainerUtils.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/AdapterContainerUtils.java
index a0fc14a5856..dd9ab8ec4c9 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/AdapterContainerUtils.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/AdapterContainerUtils.java
@@ -33,6 +33,6 @@ public final class AdapterContainerUtils {
* @return adapter container image
*/
public static String getAdapterContainerImage() {
- return System.getProperty("it.docker.proxy.image",
ProxyContainerConstants.PROXY_CONTAINER_IMAGE);
+ return System.getProperty("e2e.docker.proxy.image",
ProxyContainerConstants.PROXY_CONTAINER_IMAGE);
}
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index 8a7ed96d9a9..ced39ed0b87 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -50,7 +50,7 @@ public final class E2ETestEnvironment {
private E2ETestEnvironment() {
Properties props = loadProperties();
-
TimeZone.setDefault(TimeZone.getTimeZone(props.getProperty("it.timezone",
"UTC")));
+
TimeZone.setDefault(TimeZone.getTimeZone(props.getProperty("e2e.timezone",
"UTC")));
scenarios = getScenarios(props);
runEnvironment = new RunEnvironment(props);
clusterEnvironment = new ClusterEnvironment(props);
@@ -70,7 +70,7 @@ public final class E2ETestEnvironment {
}
private Collection<String> getScenarios(final Properties props) {
- Collection<String> result =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.scenarios",
"")).stream().filter(each -> !each.isEmpty()).collect(Collectors.toList());
+ Collection<String> result =
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.scenarios",
"")).stream().filter(each -> !each.isEmpty()).collect(Collectors.toList());
for (String each : result) {
new ScenarioCommonPath(each).checkFolderExist();
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ClusterEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ClusterEnvironment.java
index 97e993d536f..a9e448ad8ca 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ClusterEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ClusterEnvironment.java
@@ -50,7 +50,7 @@ public final class ClusterEnvironment {
public ClusterEnvironment(final Properties props) {
type = getType(props);
adapters = getAdapters(props);
- regCenterType = props.getProperty("it.cluster.regcenter");
+ regCenterType = props.getProperty("e2e.cluster.regcenter");
databaseTypes = getDatabaseTypes(props);
databaseImages = getDatabaseImages(props);
}
@@ -58,13 +58,13 @@ public final class ClusterEnvironment {
private Map<DatabaseType, String> getDatabaseImages(final Properties
props) {
Map<DatabaseType, String> result = new HashMap<>();
for (DatabaseType each :
ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class)) {
-
Optional.ofNullable(props.getProperty(String.format("it.cluster.database.%s.image",
each.getType().toLowerCase()))).ifPresent(value -> result.put(each, value));
+
Optional.ofNullable(props.getProperty(String.format("e2e.cluster.database.%s.image",
each.getType().toLowerCase()))).ifPresent(value -> result.put(each, value));
}
return result;
}
private Type getType(final Properties props) {
- String value = props.getProperty("it.cluster.env.type");
+ String value = props.getProperty("e2e.cluster.env.type");
if (null == value) {
return Type.NATIVE;
}
@@ -76,11 +76,11 @@ public final class ClusterEnvironment {
}
private Collection<String> getAdapters(final Properties props) {
- return
Splitter.on(",").trimResults().splitToList(props.getProperty("it.cluster.adapters"));
+ return
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.cluster.adapters"));
}
private Collection<DatabaseType> getDatabaseTypes(final Properties props) {
- return
Arrays.stream(props.getProperty("it.cluster.databases").split(",")).map(each ->
TypedSPILoader.getService(DatabaseType.class,
each.trim())).collect(Collectors.toSet());
+ return
Arrays.stream(props.getProperty("e2e.cluster.databases").split(",")).map(each
-> TypedSPILoader.getService(DatabaseType.class,
each.trim())).collect(Collectors.toSet());
}
/**
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeStorageEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeStorageEnvironment.java
index 1fdde1ccd18..b094b0fea07 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeStorageEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeStorageEnvironment.java
@@ -37,9 +37,9 @@ public final class NativeStorageEnvironment {
private final String password;
public NativeStorageEnvironment(final Properties props) {
- host = props.getProperty("it.native.storage.host", "127.0.0.1");
- port = Integer.parseInt(props.getProperty("it.native.storage.port",
"0"));
- user = props.getProperty("it.native.storage.username",
StorageContainerConstants.OPERATION_USER);
- password = props.getProperty("it.native.storage.password",
StorageContainerConstants.OPERATION_PASSWORD);
+ host = props.getProperty("e2e.native.storage.host", "127.0.0.1");
+ port = Integer.parseInt(props.getProperty("e2e.native.storage.port",
"0"));
+ user = props.getProperty("e2e.native.storage.username",
StorageContainerConstants.OPERATION_USER);
+ password = props.getProperty("e2e.native.storage.password",
StorageContainerConstants.OPERATION_PASSWORD);
}
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
index 28530b622ec..6da21540fa8 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java
@@ -38,9 +38,9 @@ public final class RunEnvironment {
private final boolean isRunSmokeCases;
public RunEnvironment(final Properties props) {
- modes =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.run.modes",
"")).stream()
+ modes =
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.run.modes",
"")).stream()
.filter(each -> !each.isEmpty()).map(each ->
AdapterMode.valueOf(each.toUpperCase())).collect(Collectors.toList());
- isRunAdditionalCases =
Boolean.parseBoolean(props.getProperty("it.run.additional.cases",
Boolean.FALSE.toString()));
- isRunSmokeCases =
Boolean.parseBoolean(props.getProperty("it.run.smoke.cases",
Boolean.FALSE.toString()));
+ isRunAdditionalCases =
Boolean.parseBoolean(props.getProperty("e2e.run.additional.cases",
Boolean.FALSE.toString()));
+ isRunSmokeCases =
Boolean.parseBoolean(props.getProperty("e2e.run.smoke.cases",
Boolean.FALSE.toString()));
}
}
diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml
index f6a35e8bc9e..3e1929eef0c 100644
--- a/test/e2e/fixture/pom.xml
+++ b/test/e2e/fixture/pom.xml
@@ -174,9 +174,9 @@
<profiles>
<profile>
- <id>it.env.docker</id>
+ <id>e2e.env.docker</id>
<properties>
- <it.cluster.env.type>DOCKER</it.cluster.env.type>
+ <e2e.cluster.env.type>DOCKER</e2e.cluster.env.type>
</properties>
<dependencies>
<dependency>
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
index bf6dd6ac6a3..9f56afa55ca 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
@@ -48,8 +48,8 @@ public final class PipelineE2EEnvironment {
private PipelineE2EEnvironment() {
props = loadProperties();
- itEnvType =
PipelineEnvTypeEnum.valueOf(props.getProperty("pipeline.it.env.type",
PipelineEnvTypeEnum.NONE.name()).toUpperCase());
- itProxyType =
PipelineProxyTypeEnum.valueOf(props.getProperty("pipeline.it.proxy.type",
PipelineProxyTypeEnum.NONE.name()).toUpperCase());
+ itEnvType =
PipelineEnvTypeEnum.valueOf(props.getProperty("pipeline.e2e.env.type",
PipelineEnvTypeEnum.NONE.name()).toUpperCase());
+ itProxyType =
PipelineProxyTypeEnum.valueOf(props.getProperty("pipeline.e2e.proxy.type",
PipelineProxyTypeEnum.NONE.name()).toUpperCase());
}
@SneakyThrows(IOException.class)
@@ -72,7 +72,7 @@ public final class PipelineE2EEnvironment {
*/
public int getActualDatabasePort(final DatabaseType databaseType) {
int defaultPort =
DatabaseTypedSPILoader.getService(StorageContainerOption.class,
databaseType).getCreateOption().getPort();
- return
Integer.parseInt(props.getProperty(String.format("pipeline.it.native.%s.port",
databaseType.getType().toLowerCase()), String.valueOf(defaultPort)));
+ return
Integer.parseInt(props.getProperty(String.format("pipeline.e2e.native.%s.port",
databaseType.getType().toLowerCase()), String.valueOf(defaultPort)));
}
/**
@@ -81,7 +81,7 @@ public final class PipelineE2EEnvironment {
* @return native database type
*/
public String getNativeDatabaseType() {
- return
String.valueOf(props.getProperty("pipeline.it.native.database"));
+ return
String.valueOf(props.getProperty("pipeline.e2e.native.database"));
}
/**
@@ -91,7 +91,7 @@ public final class PipelineE2EEnvironment {
* @return actual data source username
*/
public String getActualDataSourceUsername(final DatabaseType databaseType)
{
- return
String.valueOf(props.getProperty(String.format("pipeline.it.native.%s.username",
databaseType.getType().toLowerCase()),
StorageContainerConstants.OPERATION_USER));
+ return
String.valueOf(props.getProperty(String.format("pipeline.e2e.native.%s.username",
databaseType.getType().toLowerCase()),
StorageContainerConstants.OPERATION_USER));
}
/**
@@ -101,7 +101,7 @@ public final class PipelineE2EEnvironment {
* @return actual data source username
*/
public String getActualDataSourcePassword(final DatabaseType databaseType)
{
- return
String.valueOf(props.getProperty(String.format("pipeline.it.native.%s.password",
databaseType.getType().toLowerCase()),
StorageContainerConstants.OPERATION_PASSWORD));
+ return
String.valueOf(props.getProperty(String.format("pipeline.e2e.native.%s.password",
databaseType.getType().toLowerCase()),
StorageContainerConstants.OPERATION_PASSWORD));
}
/**
@@ -124,7 +124,7 @@ public final class PipelineE2EEnvironment {
if (PipelineEnvTypeEnum.NATIVE == itEnvType) {
return
databaseType.getType().equalsIgnoreCase(getNativeDatabaseType()) ?
Collections.singletonList("") : Collections.emptyList();
}
- return
Arrays.stream(props.getOrDefault(String.format("pipeline.it.docker.%s.version",
databaseType.getType().toLowerCase()), "").toString()
+ return
Arrays.stream(props.getOrDefault(String.format("pipeline.e2e.docker.%s.version",
databaseType.getType().toLowerCase()), "").toString()
.split(",")).filter(each ->
!Strings.isNullOrEmpty(each)).collect(Collectors.toList());
}
}
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
index acb40e321e7..bbec2e9b060 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
@@ -14,26 +14,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# pipeline.it.type=NONE,DOCKER,NATIVE
-pipeline.it.env.type=NONE
-#pipeline.it.proxy.type=INTERNAL
-# pipeline.it.docker.mysql.version=mysql:5.7,mysql:8.0
-pipeline.it.docker.mysql.version=
-#
pipeline.it.docker.postgresql.version=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
-pipeline.it.docker.postgresql.version=
-#
pipeline.it.docker.opengauss.version=enmotech/opengauss:3.0.0,enmotech/opengauss:2.1.0
-pipeline.it.docker.opengauss.version=
-# pipeline.it.native.database=mysql or postgresql or opengauss
-pipeline.it.native.database=
-pipeline.it.native.mysql.username=root
-pipeline.it.native.mysql.password=Test@9876
-pipeline.it.native.mysql.port=3306
-pipeline.it.native.mariadb.username=root
-pipeline.it.native.mariadb.password=Test@9876
-pipeline.it.native.mariadb.port=3306
-pipeline.it.native.postgresql.username=postgres
-pipeline.it.native.postgresql.password=Test@9876
-pipeline.it.native.postgresql.port=5432
-pipeline.it.native.opengauss.username=gaussdb
-pipeline.it.native.opengauss.password=Test@9876
-pipeline.it.native.opengauss.port=5432
+# pipeline.e2e.type=NONE,DOCKER,NATIVE
+pipeline.e2e.env.type=NONE
+#pipeline.e2e.proxy.type=INTERNAL
+# pipeline.e2e.docker.mysql.version=mysql:5.7,mysql:8.0
+pipeline.e2e.docker.mysql.version=
+#
pipeline.e2e.docker.postgresql.version=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
+pipeline.e2e.docker.postgresql.version=
+#
pipeline.e2e.docker.opengauss.version=enmotech/opengauss:3.0.0,enmotech/opengauss:2.1.0
+pipeline.e2e.docker.opengauss.version=
+# pipeline.e2e.native.database=mysql or postgresql or opengauss
+pipeline.e2e.native.database=
+pipeline.e2e.native.mysql.username=root
+pipeline.e2e.native.mysql.password=Test@9876
+pipeline.e2e.native.mysql.port=3306
+pipeline.e2e.native.mariadb.username=root
+pipeline.e2e.native.mariadb.password=Test@9876
+pipeline.e2e.native.mariadb.port=3306
+pipeline.e2e.native.postgresql.username=postgres
+pipeline.e2e.native.postgresql.password=Test@9876
+pipeline.e2e.native.postgresql.port=5432
+pipeline.e2e.native.opengauss.username=gaussdb
+pipeline.e2e.native.opengauss.password=Test@9876
+pipeline.e2e.native.opengauss.port=5432
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
index 78ac87f8f0a..e9580559b51 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
@@ -45,10 +45,10 @@ public final class ShowProcessListEnvironment {
private ShowProcessListEnvironment() {
props = loadProperties();
- runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.it.run.modes",
"Standalone,Cluster"));
- itEnvType =
ShowProcessListEnvTypeEnum.valueOf(props.getProperty("showprocesslist.it.env.type",
ShowProcessListEnvTypeEnum.NONE.name()).toUpperCase());
+ runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.run.modes",
"Standalone,Cluster"));
+ itEnvType =
ShowProcessListEnvTypeEnum.valueOf(props.getProperty("showprocesslist.e2e.env.type",
ShowProcessListEnvTypeEnum.NONE.name()).toUpperCase());
scenarios = getScenarios(props);
- governanceCenters =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.it.governance.centers"));
+ governanceCenters =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.governance.centers"));
}
/**
@@ -73,7 +73,7 @@ public final class ShowProcessListEnvironment {
}
private Collection<String> getScenarios(final Properties props) {
- Collection<String> result =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.it.scenarios",
"cluster_jdbc_proxy"));
+ Collection<String> result =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.scenarios",
"cluster_jdbc_proxy"));
for (String each : result) {
new ScenarioCommonPath(each).checkFolderExist();
}
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/showprocesslist/src/test/resources/env/e2e-env.properties
index bfcc5c6b49c..bfcc73dcdfb 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/e2e-env.properties
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/e2e-env.properties
@@ -15,11 +15,11 @@
# limitations under the License.
#
-# showprocesslist.it.env.type=NONE,DOCKER
-showprocesslist.it.env.type=NONE
-# showprocesslist.it.scenarios=cluster_jdbc_proxy
-showprocesslist.it.scenarios=cluster_jdbc_proxy
-# showprocesslist.it.run.modes=Standalone,Cluster
-showprocesslist.it.run.modes=Standalone,Cluster
-# showprocesslist.it.governance.center=Zookeeper
-showprocesslist.it.governance.centers=Zookeeper
+# showprocesslist.e2e.env.type=NONE,DOCKER
+showprocesslist.e2e.env.type=NONE
+# showprocesslist.e2e.scenarios=cluster_jdbc_proxy
+showprocesslist.e2e.scenarios=cluster_jdbc_proxy
+# showprocesslist.e2e.run.modes=Standalone,Cluster
+showprocesslist.e2e.run.modes=Standalone,Cluster
+# showprocesslist.e2e.governance.center=Zookeeper
+showprocesslist.e2e.governance.centers=Zookeeper
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
index f1d7f45c88d..9601e65c103 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
@@ -66,14 +66,14 @@ public final class TransactionE2EEnvironment {
private TransactionE2EEnvironment() {
props = loadProperties();
- itEnvType =
TransactionE2EEnvTypeEnum.valueOf(props.getProperty("transaction.it.env.type",
TransactionE2EEnvTypeEnum.NONE.name()).toUpperCase());
- portBindings = splitProperty("transaction.it.proxy.port.bindings");
- mysqlVersions = splitProperty("transaction.it.docker.mysql.version");
- postgresqlVersions =
splitProperty("transaction.it.docker.postgresql.version");
- openGaussVersions =
splitProperty("transaction.it.docker.opengauss.version");
- needToRunTestCases = splitProperty("transaction.it.env.cases");
- allowTransactionTypes = splitProperty("transaction.it.env.transtypes");
- allowXAProviders = splitProperty("transaction.it.env.xa.providers");
+ itEnvType =
TransactionE2EEnvTypeEnum.valueOf(props.getProperty("transaction.e2e.env.type",
TransactionE2EEnvTypeEnum.NONE.name()).toUpperCase());
+ portBindings = splitProperty("transaction.e2e.proxy.port.bindings");
+ mysqlVersions = splitProperty("transaction.e2e.docker.mysql.version");
+ postgresqlVersions =
splitProperty("transaction.e2e.docker.postgresql.version");
+ openGaussVersions =
splitProperty("transaction.e2e.docker.opengauss.version");
+ needToRunTestCases = splitProperty("transaction.e2e.env.cases");
+ allowTransactionTypes =
splitProperty("transaction.e2e.env.transtypes");
+ allowXAProviders = splitProperty("transaction.e2e.env.xa.providers");
log.info("Loaded properties, allowTransactionTypes:{},
allowXAProviders:{}", allowTransactionTypes, allowXAProviders);
transactionTestCaseRegistryMap = initTransactionTestCaseRegistryMap();
}
@@ -113,11 +113,11 @@ public final class TransactionE2EEnvironment {
public int getActualDataSourceDefaultPort(final DatabaseType databaseType)
{
switch (databaseType.getType()) {
case "MySQL":
- return
Integer.parseInt(props.getOrDefault("transaction.it.native.mysql.port", new
MySQLStorageContainerCreateOption().getPort()).toString());
+ return
Integer.parseInt(props.getOrDefault("transaction.e2e.native.mysql.port", new
MySQLStorageContainerCreateOption().getPort()).toString());
case "PostgreSQL":
- return
Integer.parseInt(props.getOrDefault("transaction.it.native.postgresql.port",
new PostgreSQLStorageContainerCreateOption().getPort()).toString());
+ return
Integer.parseInt(props.getOrDefault("transaction.e2e.native.postgresql.port",
new PostgreSQLStorageContainerCreateOption().getPort()).toString());
case "openGauss":
- return
Integer.parseInt(props.getOrDefault("transaction.it.native.opengauss.port", new
OpenGaussStorageContainerCreateOption().getPort()).toString());
+ return
Integer.parseInt(props.getOrDefault("transaction.e2e.native.opengauss.port",
new OpenGaussStorageContainerCreateOption().getPort()).toString());
default:
throw new
UnsupportedOperationException(String.format("Unsupported database type: `%s`",
databaseType.getType()));
}
@@ -131,7 +131,7 @@ public final class TransactionE2EEnvironment {
*/
public String getActualDataSourceUsername(final DatabaseType databaseType)
{
return itEnvType == TransactionE2EEnvTypeEnum.NATIVE
- ?
String.valueOf(props.getOrDefault(String.format("transaction.it.native.%s.username",
databaseType.getType().toLowerCase()), ProxyContainerConstants.USER))
+ ?
String.valueOf(props.getOrDefault(String.format("transaction.e2e.native.%s.username",
databaseType.getType().toLowerCase()), ProxyContainerConstants.USER))
: StorageContainerConstants.OPERATION_USER;
}
@@ -143,7 +143,7 @@ public final class TransactionE2EEnvironment {
*/
public String getActualDataSourcePassword(final DatabaseType databaseType)
{
return itEnvType == TransactionE2EEnvTypeEnum.NATIVE
- ?
props.getOrDefault(String.format("transaction.it.native.%s.password",
databaseType.getType().toLowerCase()),
ProxyContainerConstants.PASSWORD).toString()
+ ?
props.getOrDefault(String.format("transaction.e2e.native.%s.password",
databaseType.getType().toLowerCase()),
ProxyContainerConstants.PASSWORD).toString()
: StorageContainerConstants.OPERATION_PASSWORD;
}
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
index 0979bdaae88..272eaf0697f 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
@@ -14,23 +14,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# transaction.it.type=NONE,DOCKER,NATIVE
-transaction.it.env.type=NONE
-# transaction.it.proxy.binding.ports=63308:3308
-# transaction.it.env.cases=ClassicTransferTestCase
-transaction.it.env.cases=TransactionDeadlockTestCase,
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase,
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase,
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase,
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase,
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase,
MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase,
NestedTransactionTestCase, [...]
-# transaction.it.env.transtypes=LOCAL, XA, BASE
-transaction.it.env.transtypes=LOCAL, XA
-# transaction.it.env.xa.providers=Atomikos, Narayana
-transaction.it.env.xa.providers=Atomikos, Narayana
-# transaction.it.docker.mysql.version=mysql:5.7,mysql:8.0
-transaction.it.docker.mysql.version=
-#
transaction.it.docker.postgresql.version=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
-transaction.it.docker.postgresql.version=
-#
transaction.it.docker.opengauss.version=enmotech/opengauss:3.0.0,enmotech/opengauss:2.1.0
-transaction.it.docker.opengauss.version=
+# transaction.e2e.type=NONE,DOCKER,NATIVE
+transaction.e2e.env.type=NONE
+# transaction.e2e.proxy.binding.ports=63308:3308
+# transaction.e2e.env.cases=ClassicTransferTestCase
+transaction.e2e.env.cases=TransactionDeadlockTestCase,
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase,
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase,
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase,
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase,
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase,
MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase,
NestedTransactionTestCase, [...]
+# transaction.e2e.env.transtypes=LOCAL, XA, BASE
+transaction.e2e.env.transtypes=LOCAL, XA
+# transaction.e2e.env.xa.providers=Atomikos, Narayana
+transaction.e2e.env.xa.providers=Atomikos, Narayana
+# transaction.e2e.docker.mysql.version=mysql:5.7,mysql:8.0
+transaction.e2e.docker.mysql.version=
+#
transaction.e2e.docker.postgresql.version=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
+transaction.e2e.docker.postgresql.version=
+#
transaction.e2e.docker.opengauss.version=enmotech/opengauss:3.0.0,enmotech/opengauss:2.1.0
+transaction.e2e.docker.opengauss.version=
-it.native.storage.host=127.0.0.1
-it.native.storage.port=3306
-it.native.storage.username=root
-it.native.storage.password=root
+e2e.native.storage.host=127.0.0.1
+e2e.native.storage.port=3306
+e2e.native.storage.username=root
+e2e.native.storage.password=root
diff --git a/test/e2e/sql/src/test/resources/env/e2e-env.properties
b/test/e2e/sql/src/test/resources/env/e2e-env.properties
index 582ff7d9bb1..a35243acfed 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -15,26 +15,26 @@
# limitations under the License.
#
-#it.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
-it.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
+#e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
+e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,distsql_rdl,empty_rules,sharding_and_encrypt,encrypt_and_readwrite_splitting,encrypt_shadow,readwrite_splitting_and_shadow,sharding_and_shadow,sharding_encrypt_shadow,mask,mask_encrypt,mask_sharding,mask_encrypt_sharding,db_tbl_sql_federation
-#it.run.modes=Standalone,Cluster
-it.run.modes=
-it.run.additional.cases=false
-it.run.smoke.cases=false
+#e2e.run.modes=Standalone,Cluster
+e2e.run.modes=
+e2e.run.additional.cases=false
+e2e.run.smoke.cases=false
-# it.cluster.env.type=DOCKER,NATIVE
-it.cluster.env.type=DOCKER
+# e2e.cluster.env.type=DOCKER,NATIVE
+e2e.cluster.env.type=DOCKER
-# it.cluster.adapters=jdbc,proxy
-it.cluster.adapters=proxy
+# e2e.cluster.adapters=jdbc,proxy
+e2e.cluster.adapters=proxy
-# it.cluster.databases=MySQL,PostgreSQL,openGauss,Hive
-it.cluster.databases=MySQL
+# e2e.cluster.databases=MySQL,PostgreSQL,openGauss,Hive
+e2e.cluster.databases=MySQL
-#it.cluster.database.mysql.image=mysql:8.2.0
+#e2e.cluster.database.mysql.image=mysql:8.2.0
-it.native.storage.host=127.0.0.1
-it.native.storage.port=3306
-it.native.storage.username=root
-it.native.storage.password=root
+e2e.native.storage.host=127.0.0.1
+e2e.native.storage.port=3306
+e2e.native.storage.username=root
+e2e.native.storage.password=root
