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 ea7f061f2f4 Rename properties key prefix from e2e.cluster to
e2e.artifact (#36665)
ea7f061f2f4 is described below
commit ea7f061f2f4a67e98a199fa558b1f8617e2b9a08
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 23 11:53:46 2025 +0800
Rename properties key prefix from e2e.cluster to e2e.artifact (#36665)
---
.github/workflows/e2e-sql.yml | 2 +-
.github/workflows/nightly-e2e-sql.yml | 2 +-
.../content/test-manual/integration-test/_index.cn.md | 16 ++++++++--------
.../content/test-manual/integration-test/_index.en.md | 19 ++++++++++---------
.../container/adapter/AdapterContainerFactory.java | 4 ++--
.../test/e2e/env/runtime/E2ETestEnvironment.java | 6 +++---
...usterEnvironment.java => ArtifactEnvironment.java} | 16 ++++++++--------
test/e2e/fixture/pom.xml | 2 +-
.../compose/mode/ClusterContainerComposer.java | 6 +++---
.../compose/mode/StandaloneContainerComposer.java | 6 +++---
.../SQLE2EProxyContainerConfigurationFactory.java | 2 +-
.../array/ClusterTestParameterArrayGenerator.java | 8 ++++----
.../array/JdbcStandaloneTestParameterGenerator.java | 4 ++--
.../array/ProxyStandaloneTestParameterGenerator.java | 8 ++++----
.../e2e/sql/src/test/resources/env/e2e-env.properties | 14 +++++++-------
15 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index fd759221868..10bde486254 100644
--- a/.github/workflows/e2e-sql.yml
+++ b/.github/workflows/e2e-sql.yml
@@ -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 -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 }}
+ run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -De2e.artifact.env.type=DOCKER
-De2e.artifact.adapters=${{ matrix.adapter }} -De2e.run.modes=${{ matrix.mode
}} -De2e.run.additional.cases=false -De2e.scenarios=${{ matrix.scenario }}
-De2e.artifact.databases=${{ matrix.database }} ${{ matrix.additional-options }}
diff --git a/.github/workflows/nightly-e2e-sql.yml
b/.github/workflows/nightly-e2e-sql.yml
index 50422bf90bb..8504b73e0fc 100644
--- a/.github/workflows/nightly-e2e-sql.yml
+++ b/.github/workflows/nightly-e2e-sql.yml
@@ -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 -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 }}
+ run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -De2e.artifact.env.type=DOCKER
-De2e.artifact.adapters=${{ matrix.adapter }} -De2e.run.modes=${{ matrix.mode
}} -De2e.run.additional.cases=false -De2e.scenarios=${{ matrix.scenario }}
-De2e.artifact.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 1131c28382f..5773087e42e 100644
--- a/docs/document/content/test-manual/integration-test/_index.cn.md
+++ b/docs/document/content/test-manual/integration-test/_index.cn.md
@@ -104,7 +104,7 @@ SQL 用例在
`resources/cases/${SQL-TYPE}/e2e-${SQL-TYPE}-${cases-description}.
#### Native 环境配置
-修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`e2e.cluster.env.type` 为 `NATIVE` 模式，然后修改如下的属性为本地数据库地址和账号。
+修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`e2e.artifact.env.type` 为 `NATIVE` 模式，然后修改如下的属性为本地数据库地址和账号。
```properties
e2e.native.storage.host=127.0.0.1
@@ -117,7 +117,7 @@ e2e.native.storage.password=123456
#### Docker 环境配置
-修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`e2e.cluster.env.type` 为 `DOCKER` 模式，如果执行 Proxy 接入端测试，需要执行如下的命令打包 Proxy 镜像。
+修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中
`e2e.artifact.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
@@ -160,16 +160,16 @@ e2e.run.smoke.cases=false
e2e.run.modes=Cluster
# 配置环境类型，只支持单值。可选值：DOCKER, NATIVE
-e2e.cluster.env.type=${e2e.env}
+e2e.artifact.env.type=${e2e.env}
# 待测试的接入端类型，多个值可用逗号分隔。可选值：jdbc, proxy, 默认值：jdbc
-e2e.cluster.adapters=jdbc
+e2e.artifact.adapters=jdbc
# 场景类型，多个值可用逗号分隔。可选值：H2, MySQL, PostgreSQL，openGauss
-e2e.cluster.databases=H2,MySQL,PostgreSQL,openGauss
+e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
# 测试数据库的镜像版本
-e2e.cluster.database.mysql.image=mysql:8.2.0
+e2e.artifact.database.mysql.image=mysql:8.2.0
# NATIVE 模式下数据库连接信息及账号
e2e.native.storage.host=127.0.0.1
@@ -193,14 +193,14 @@ e2e.native.storage.password=123456
#### 运行 Docker 模式
```bash
-./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
+./mvnw -B clean install -f test/e2e/pom.xml -Pit.env.docker
-De2e.artifact.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.artifact.databases=MySQL
```
运行以上命令会构建出一个用于集成测试的 Docker 镜像 `apache/shardingsphere-proxy-test:latest`。
如果仅修改了测试代码，可以复用已有的测试镜像，无须重新构建。使用以下命令可以跳过镜像构建，直接运行集成测试：
```bash
-./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
+./mvnw -B clean install -f test/e2e/sql/pom.xml -Pit.env.docker
-De2e.artifact.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.artifact.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 82086f6a13f..606cb6a6a94 100644
--- a/docs/document/content/test-manual/integration-test/_index.en.md
+++ b/docs/document/content/test-manual/integration-test/_index.en.md
@@ -106,7 +106,7 @@ The assertion file format is as follows:
#### Native environment configuration
-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.
+Modify `e2e.artifact.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
e2e.native.storage.host=127.0.0.1
@@ -119,7 +119,8 @@ After the modification is completed, you can adjust other
properties in `e2e-env
#### Docker environment configuration
-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.
+Modify `e2e.artifact.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
@@ -158,16 +159,16 @@ e2e.run.additional.cases=false
e2e.run.smoke.cases=false
# Configure the environment type. Only one value is supported. Optional value:
DOCKER, NATIVE
-e2e.cluster.env.type=${e2e.env}
+e2e.artifact.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
-e2e.cluster.adapters=jdbc
+e2e.artifact.adapters=jdbc
-# Scenario type. Multiple values can be separated by commas. Optional value:
H2, MySQL, PostgreSQL, openGauss
-e2e.cluster.databases=H2,MySQL,PostgreSQL,openGauss
+# Database type. Multiple values can be separated by commas. Optional value:
H2, MySQL, PostgreSQL, openGauss
+e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
# The mirror version of the database
-e2e.cluster.database.mysql.image=mysql:8.2.0
+e2e.artifact.database.mysql.image=mysql:8.2.0
# Database connection information and account in NATIVE mode
e2e.native.storage.host=127.0.0.1
@@ -191,13 +192,13 @@ e2e.native.storage.password=123456
#### Run Docker mode
```bash
-./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
+./mvnw -B clean install -f test/e2e/pom.xml -Pit.env.docker
-De2e.artifact.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.artifact.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
-De2e.cluster.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.cluster.databases=MySQL
+./mvnw -B clean install -f test/e2e/sql/pom.xml -Pit.env.docker
-De2e.artifact.adapters=proxy,jdbc
-De2e.scenarios=${scenario_name_1,scenario_name_2,scenario_name_n}
-De2e.artifact.databases=MySQL
```
#### Remote debug Proxy code in Docker container
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
index 8c7afd2db99..85c4ffa2dab 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSph
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyDockerContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
-import org.apache.shardingsphere.test.e2e.env.runtime.type.ClusterEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioCommonPath;
/**
@@ -60,7 +60,7 @@ public final class AdapterContainerFactory {
}
private static AdapterContainer newProxyInstance(final DatabaseType
databaseType, final AdaptorContainerConfiguration containerConfig, final String
envType) {
- return ClusterEnvironment.Type.NATIVE.name().equalsIgnoreCase(envType)
+ return ArtifactEnvironment.Type.NATIVE.name().equalsIgnoreCase(envType)
? new ShardingSphereProxyEmbeddedContainer(databaseType,
containerConfig)
: new ShardingSphereProxyDockerContainer(databaseType,
containerConfig);
}
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 ced39ed0b87..a3ff19731d4 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.env.runtime;
import com.google.common.base.Splitter;
import lombok.Getter;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.e2e.env.runtime.type.ClusterEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.NativeStorageEnvironment;
import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioCommonPath;
@@ -44,7 +44,7 @@ public final class E2ETestEnvironment {
private final RunEnvironment runEnvironment;
- private final ClusterEnvironment clusterEnvironment;
+ private final ArtifactEnvironment artifactEnvironment;
private final NativeStorageEnvironment nativeStorageEnvironment;
@@ -53,7 +53,7 @@ public final class E2ETestEnvironment {
TimeZone.setDefault(TimeZone.getTimeZone(props.getProperty("e2e.timezone",
"UTC")));
scenarios = getScenarios(props);
runEnvironment = new RunEnvironment(props);
- clusterEnvironment = new ClusterEnvironment(props);
+ artifactEnvironment = new ArtifactEnvironment(props);
nativeStorageEnvironment = new NativeStorageEnvironment(props);
}
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/ArtifactEnvironment.java
similarity index 82%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ClusterEnvironment.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
index a9e448ad8ca..cf6d2cc64bd 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/ArtifactEnvironment.java
@@ -32,10 +32,10 @@ import java.util.Properties;
import java.util.stream.Collectors;
/**
- * Cluster environment.
+ * Artifact environment.
*/
@Getter
-public final class ClusterEnvironment {
+public final class ArtifactEnvironment {
private final Type type;
@@ -47,10 +47,10 @@ public final class ClusterEnvironment {
private final Map<DatabaseType, String> databaseImages;
- public ClusterEnvironment(final Properties props) {
+ public ArtifactEnvironment(final Properties props) {
type = getType(props);
adapters = getAdapters(props);
- regCenterType = props.getProperty("e2e.cluster.regcenter");
+ regCenterType = props.getProperty("e2e.artifact.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("e2e.cluster.database.%s.image",
each.getType().toLowerCase()))).ifPresent(value -> result.put(each, value));
+
Optional.ofNullable(props.getProperty(String.format("e2e.artifact.database.%s.image",
each.getType().toLowerCase()))).ifPresent(value -> result.put(each, value));
}
return result;
}
private Type getType(final Properties props) {
- String value = props.getProperty("e2e.cluster.env.type");
+ String value = props.getProperty("e2e.artifact.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("e2e.cluster.adapters"));
+ return
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.artifact.adapters"));
}
private Collection<DatabaseType> getDatabaseTypes(final Properties props) {
- return
Arrays.stream(props.getProperty("e2e.cluster.databases").split(",")).map(each
-> TypedSPILoader.getService(DatabaseType.class,
each.trim())).collect(Collectors.toSet());
+ return
Arrays.stream(props.getProperty("e2e.artifact.databases").split(",")).map(each
-> TypedSPILoader.getService(DatabaseType.class,
each.trim())).collect(Collectors.toSet());
}
/**
diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml
index 3e1929eef0c..73ed67ad4d7 100644
--- a/test/e2e/fixture/pom.xml
+++ b/test/e2e/fixture/pom.xml
@@ -176,7 +176,7 @@
<profile>
<id>e2e.env.docker</id>
<properties>
- <e2e.cluster.env.type>DOCKER</e2e.cluster.env.type>
+ <e2e.artifact.env.type>DOCKER</e2e.artifact.env.type>
</properties>
<dependencies>
<dependency>
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
index c9f8d5cf87b..e18d04913c8 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageCo
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import
org.apache.shardingsphere.test.e2e.env.runtime.type.ClusterEnvironment.Type;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
@@ -58,9 +58,9 @@ public final class ClusterContainerComposer implements
ContainerComposer {
containers = new E2EContainers(scenario);
// TODO support other types of governance
governanceContainer = containers.registerContainer(new
GovernanceContainer(TypedSPILoader.getService(GovernanceContainerOption.class,
"ZooKeeper")));
- Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
+ Type envType =
E2ETestEnvironment.getInstance().getArtifactEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
- ? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getClusterEnvironment().getDatabaseImages().get(databaseType),
+ ? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getArtifactEnvironment().getDatabaseImages().get(databaseType),
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster",
databaseType);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
index cd63be21844..600be5f5c40 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageCo
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import
org.apache.shardingsphere.test.e2e.env.runtime.type.ClusterEnvironment.Type;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
@@ -50,9 +50,9 @@ public final class StandaloneContainerComposer implements
ContainerComposer {
public StandaloneContainerComposer(final String scenario, final
DatabaseType databaseType, final AdapterType adapterType) {
containers = new E2EContainers(scenario);
- Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
+ Type envType =
E2ETestEnvironment.getInstance().getArtifactEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
- ? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getClusterEnvironment().getDatabaseImages().get(databaseType),
+ ? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getArtifactEnvironment().getDatabaseImages().get(databaseType),
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "standalone",
databaseType);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
index 403ddb22afb..f0813f4a46f 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
@@ -69,7 +69,7 @@ public final class SQLE2EProxyContainerConfigurationFactory {
}
private static String getRegistryCenterType(final String modeType) {
- String regCenterType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getRegCenterType();
+ String regCenterType =
E2ETestEnvironment.getInstance().getArtifactEnvironment().getRegCenterType();
if (Strings.isNullOrEmpty(regCenterType)) {
return "cluster".equals(modeType) ? "zookeeper" : "memory";
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
index 2f47aa63393..4b7ae2650b4 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -42,8 +42,8 @@ public final class ClusterTestParameterArrayGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER,
- ENV.getClusterEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getAssertionTestParameter(sqlCommandType);
+ return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER,
+ ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getAssertionTestParameter(sqlCommandType);
}
/**
@@ -53,7 +53,7 @@ public final class ClusterTestParameterArrayGenerator {
* @return case parameter
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER,
- ENV.getClusterEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getCaseTestParameter(sqlCommandType);
+ return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER,
+ ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index e29ff548634..ef41afea7df 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -46,7 +46,7 @@ public final class JdbcStandaloneTestParameterGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE, ENV.getClusterEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE, ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
.getAssertionTestParameter(sqlCommandType);
}
@@ -57,7 +57,7 @@ public final class JdbcStandaloneTestParameterGenerator {
* @return case test parameter
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
- return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE, ENV.getClusterEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE, ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases())
.getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index 0a8c23efbaa..d682dc6e31e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -42,8 +42,8 @@ public final class ProxyStandaloneTestParameterGenerator {
* @return assertion test parameters
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
- ENV.getScenarios(), AdapterMode.STANDALONE,
ENV.getClusterEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getAssertionTestParameter(sqlCommandType);
+ return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
+ ENV.getScenarios(), AdapterMode.STANDALONE,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getAssertionTestParameter(sqlCommandType);
}
/**
@@ -53,7 +53,7 @@ public final class ProxyStandaloneTestParameterGenerator {
* @return assertion test parameters
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
- ENV.getScenarios(), AdapterMode.STANDALONE,
ENV.getClusterEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getCaseTestParameter(sqlCommandType);
+ return new
E2ETestParameterGenerator(ENV.getArtifactEnvironment().getAdapters(),
+ ENV.getScenarios(), AdapterMode.STANDALONE,
ENV.getArtifactEnvironment().getDatabaseTypes(),
ENV.getRunEnvironment().isRunSmokeCases()).getCaseTestParameter(sqlCommandType);
}
}
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 a35243acfed..7ccdce5a396 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -23,16 +23,16 @@ e2e.run.modes=
e2e.run.additional.cases=false
e2e.run.smoke.cases=false
-# e2e.cluster.env.type=DOCKER,NATIVE
-e2e.cluster.env.type=DOCKER
+# e2e.artifact.env.type=DOCKER,NATIVE
+e2e.artifact.env.type=DOCKER
-# e2e.cluster.adapters=jdbc,proxy
-e2e.cluster.adapters=proxy
+# e2e.artifact.adapters=jdbc,proxy
+e2e.artifact.adapters=proxy
-# e2e.cluster.databases=MySQL,PostgreSQL,openGauss,Hive
-e2e.cluster.databases=MySQL
+# e2e.artifact.databases=MySQL,PostgreSQL,openGauss,Hive
+e2e.artifact.databases=MySQL
-#e2e.cluster.database.mysql.image=mysql:8.2.0
+#e2e.artifact.database.mysql.image=mysql:8.2.0
e2e.native.storage.host=127.0.0.1
e2e.native.storage.port=3306
