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 5213e371687 Rename properties key it.cluster.env.type to e2e.run.type
(#36670)
5213e371687 is described below
commit 5213e3716872a5ef4e2d871b0f11791502a2c192
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 23 18:07:14 2025 +0800
Rename properties key it.cluster.env.type to e2e.run.type (#36670)
* Rename properties key it.cluster.env.type to e2e.run.type
* Rename properties key it.cluster.env.type to e2e.run.type
---
.github/workflows/e2e-sql.yml | 2 +-
.github/workflows/nightly-e2e-sql.yml | 2 +-
.../test-manual/integration-test/_index.cn.md | 6 +++---
.../test-manual/integration-test/_index.en.md | 6 +++---
.../container/adapter/AdapterContainerFactory.java | 4 ++--
.../e2e/env/runtime/type/ArtifactEnvironment.java | 23 ----------------------
.../test/e2e/env/runtime/type/RunEnvironment.java | 23 ++++++++++++++++++++++
test/e2e/fixture/pom.xml | 2 +-
.../compose/mode/ClusterContainerComposer.java | 4 ++--
.../compose/mode/StandaloneContainerComposer.java | 4 ++--
.../sql/src/test/resources/env/e2e-env.properties | 4 ++--
11 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index abf5cff49ac..f122e6fb671 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.artifact.env.type=DOCKER
-De2e.artifact.modes=${{ matrix.mode }} -De2e.artifact.adapters=${{
matrix.adapter }} -De2e.run.additional.cases=false -De2e.scenarios=${{
matrix.scenario }} -De2e.artifact.databases=${{ matrix.database }} ${{
matrix.additional-options }}
+ run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -De2e.run.type=DOCKER -De2e.artifact.modes=${{
matrix.mode }} -De2e.artifact.adapters=${{ matrix.adapter }}
-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 5bddd3abc83..0540ac4bfd7 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.artifact.env.type=DOCKER
-De2e.artifact.modes=${{ matrix.mode }} -De2e.artifact.adapters=${{
matrix.adapter }} -De2e.run.additional.cases=false -De2e.scenarios=${{
matrix.scenario }} -De2e.artifact.databases=${{ matrix.database }} ${{
matrix.additional-options }}
+ run: ./mvnw -nsu -B install -f test/e2e/sql/pom.xml
-Dspotless.apply.skip=true -De2e.run.type=DOCKER -De2e.artifact.modes=${{
matrix.mode }} -De2e.artifact.adapters=${{ matrix.adapter }}
-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 380552faecd..0be5dfe62ea 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.artifact.env.type` 为 `NATIVE` 模式，然后修改如下的属性为本地数据库地址和账号。
+修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中 `e2e.run.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.artifact.env.type` 为 `DOCKER` 模式，如果执行 Proxy 接入端测试，需要执行如下的命令打包 Proxy 镜像。
+修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中 `e2e.run.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
@@ -157,7 +157,7 @@ e2e.run.additional.cases=false
e2e.run.smoke.cases=false
# 配置环境类型，只支持单值。可选值：DOCKER, NATIVE
-e2e.artifact.env.type=${e2e.env}
+e2e.run.type=DOCKER
# 运行模式，多个值可用逗号分隔。可选值：Standalone, Cluster
e2e.artifact.modes=Cluster
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 606cb6a6a94..134a1590f71 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.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.
+Modify `e2e.run.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,7 @@ After the modification is completed, you can adjust other
properties in `e2e-env
#### Docker environment configuration
-Modify `e2e.artifact.env.type` in the
`src/test/resources/env/e2e-env.properties` file of the `e2e-sql` module to
`DOCKER` mode.
+Modify `e2e.run.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
@@ -159,7 +159,7 @@ e2e.run.additional.cases=false
e2e.run.smoke.cases=false
# Configure the environment type. Only one value is supported. Optional value:
DOCKER, NATIVE
-e2e.artifact.env.type=${e2e.env}
+e2e.run.type=DOCKER
# Access port types to be tested. Multiple values can be separated by commas.
Optional value: jdbc, proxy. The default value: jdbc
e2e.artifact.adapters=jdbc
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 85c4ffa2dab..e6f8e3a5c72 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.ArtifactEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
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 ArtifactEnvironment.Type.NATIVE.name().equalsIgnoreCase(envType)
+ return RunEnvironment.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/type/ArtifactEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
index 3bd5e6c8932..b2434879db3 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
@@ -37,8 +37,6 @@ import java.util.stream.Collectors;
@Getter
public final class ArtifactEnvironment {
- private final Type type;
-
private final Collection<AdapterMode> modes;
private final Collection<String> adapters;
@@ -50,7 +48,6 @@ public final class ArtifactEnvironment {
private final Map<DatabaseType, String> databaseImages;
public ArtifactEnvironment(final Properties props) {
- type = getType(props);
modes =
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.artifact.modes",
"")).stream()
.filter(each -> !each.isEmpty()).map(each ->
AdapterMode.valueOf(each.toUpperCase())).collect(Collectors.toList());
adapters = getAdapters(props);
@@ -67,18 +64,6 @@ public final class ArtifactEnvironment {
return result;
}
- private Type getType(final Properties props) {
- String value = props.getProperty("e2e.artifact.env.type");
- if (null == value) {
- return Type.NATIVE;
- }
- try {
- return Type.valueOf(value);
- } catch (final IllegalArgumentException ignored) {
- return Type.NATIVE;
- }
- }
-
private Collection<String> getAdapters(final Properties props) {
return
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.artifact.adapters",
"")).stream().filter(each -> !each.isEmpty()).collect(Collectors.toList());
}
@@ -87,12 +72,4 @@ public final class ArtifactEnvironment {
return
Splitter.on(",").trimResults().splitToList(props.getProperty("e2e.artifact.databases",
"")).stream()
.filter(each -> !each.isEmpty()).map(each ->
TypedSPILoader.getService(DatabaseType.class,
each.trim())).collect(Collectors.toSet());
}
-
- /**
- * Cluster environment type.
- */
- public enum Type {
-
- DOCKER, NATIVE
- }
}
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 ef3a6c2d901..309cb3070bc 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
@@ -27,12 +27,35 @@ import java.util.Properties;
@Getter
public final class RunEnvironment {
+ private final Type type;
+
private final boolean isRunAdditionalCases;
private final boolean isRunSmokeCases;
public RunEnvironment(final Properties props) {
+ type = getType(props);
isRunAdditionalCases =
Boolean.parseBoolean(props.getProperty("e2e.run.additional.cases",
Boolean.FALSE.toString()));
isRunSmokeCases =
Boolean.parseBoolean(props.getProperty("e2e.run.smoke.cases",
Boolean.FALSE.toString()));
}
+
+ private Type getType(final Properties props) {
+ String value = props.getProperty("e2e.run.type");
+ if (null == value) {
+ return Type.NATIVE;
+ }
+ try {
+ return Type.valueOf(value);
+ } catch (final IllegalArgumentException ignored) {
+ return Type.NATIVE;
+ }
+ }
+
+ /**
+ * Cluster environment type.
+ */
+ public enum Type {
+
+ DOCKER, NATIVE
+ }
}
diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml
index 73ed67ad4d7..48629de1840 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.artifact.env.type>DOCKER</e2e.artifact.env.type>
+ <e2e.run.type>DOCKER</e2e.run.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 e18d04913c8..4d6c8f41361 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.ArtifactEnvironment.Type;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
@@ -58,7 +58,7 @@ 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().getArtifactEnvironment().getType();
+ Type envType =
E2ETestEnvironment.getInstance().getRunEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getArtifactEnvironment().getDatabaseImages().get(databaseType),
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
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 600be5f5c40..a56848f27a3 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.ArtifactEnvironment.Type;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
@@ -50,7 +50,7 @@ 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().getArtifactEnvironment().getType();
+ Type envType =
E2ETestEnvironment.getInstance().getRunEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getArtifactEnvironment().getDatabaseImages().get(databaseType),
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
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 71a0db5d6b3..be5df4accc2 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -21,8 +21,8 @@
e2e.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_spl
e2e.run.additional.cases=false
e2e.run.smoke.cases=false
-# e2e.artifact.env.type=DOCKER,NATIVE
-e2e.artifact.env.type=DOCKER
+# e2e.run.type=DOCKER,NATIVE
+e2e.run.type=DOCKER
#e2e.artifact.modes=Standalone,Cluster
e2e.artifact.modes=
