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 22bfdfdf866 Rename properties key it.run.modes to e2e.artifact.modes
(#36668)
22bfdfdf866 is described below
commit 22bfdfdf8665449360246632875e06ee6d92677d
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Sep 23 14:31:56 2025 +0800
Rename properties key it.run.modes to e2e.artifact.modes (#36668)
---
.github/workflows/e2e-sql.yml | 2 +-
.github/workflows/nightly-e2e-sql.yml | 2 +-
docs/document/content/test-manual/integration-test/_index.cn.md | 6 +++---
.../test/e2e/env/runtime/type/ArtifactEnvironment.java | 5 +++++
.../shardingsphere/test/e2e/env/runtime/type/RunEnvironment.java | 8 --------
.../operation/showprocesslist/env/ShowProcessListEnvironment.java | 6 +++---
.../showprocesslist/src/test/resources/env/e2e-env.properties | 4 ++--
.../e2e/sql/framework/param/array/E2ETestParameterFactory.java | 6 +++---
test/e2e/sql/src/test/resources/env/e2e-env.properties | 5 +++--
9 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index 10bde486254..abf5cff49ac 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.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 }}
+ 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 }}
diff --git a/.github/workflows/nightly-e2e-sql.yml
b/.github/workflows/nightly-e2e-sql.yml
index 8504b73e0fc..5bddd3abc83 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.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 }}
+ 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 }}
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 5773087e42e..380552faecd 100644
--- a/docs/document/content/test-manual/integration-test/_index.cn.md
+++ b/docs/document/content/test-manual/integration-test/_index.cn.md
@@ -156,12 +156,12 @@ e2e.run.additional.cases=false
# 是否运行冒烟测试
e2e.run.smoke.cases=false
-# 运行模式，多个值可用逗号分隔。可选值：Standalone, Cluster
-e2e.run.modes=Cluster
-
# 配置环境类型，只支持单值。可选值：DOCKER, NATIVE
e2e.artifact.env.type=${e2e.env}
+# 运行模式，多个值可用逗号分隔。可选值：Standalone, Cluster
+e2e.artifact.modes=Cluster
+
# 待测试的接入端类型，多个值可用逗号分隔。可选值：jdbc, proxy, 默认值：jdbc
e2e.artifact.adapters=jdbc
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 cf6d2cc64bd..f4574af047a 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
@@ -22,6 +22,7 @@ import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import java.util.Arrays;
import java.util.Collection;
@@ -39,6 +40,8 @@ public final class ArtifactEnvironment {
private final Type type;
+ private final Collection<AdapterMode> modes;
+
private final Collection<String> adapters;
private final String regCenterType;
@@ -49,6 +52,8 @@ public final class ArtifactEnvironment {
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);
regCenterType = props.getProperty("e2e.artifact.regcenter");
databaseTypes = getDatabaseTypes(props);
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 6da21540fa8..ef3a6c2d901 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
@@ -17,13 +17,9 @@
package org.apache.shardingsphere.test.e2e.env.runtime.type;
-import com.google.common.base.Splitter;
import lombok.Getter;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
-import java.util.Collection;
import java.util.Properties;
-import java.util.stream.Collectors;
/**
* Run environment.
@@ -31,15 +27,11 @@ import java.util.stream.Collectors;
@Getter
public final class RunEnvironment {
- private final Collection<AdapterMode> modes;
-
private final boolean isRunAdditionalCases;
private final boolean isRunSmokeCases;
public RunEnvironment(final Properties props) {
- 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("e2e.run.additional.cases",
Boolean.FALSE.toString()));
isRunSmokeCases =
Boolean.parseBoolean(props.getProperty("e2e.run.smoke.cases",
Boolean.FALSE.toString()));
}
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 e9580559b51..e52f4e47e06 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
@@ -33,20 +33,20 @@ public final class ShowProcessListEnvironment {
private static final ShowProcessListEnvironment INSTANCE = new
ShowProcessListEnvironment();
- private final Collection<String> runModes;
-
private final Properties props;
private final ShowProcessListEnvTypeEnum itEnvType;
+ private final Collection<String> runModes;
+
private final Collection<String> scenarios;
private final Collection<String> governanceCenters;
private ShowProcessListEnvironment() {
props = loadProperties();
- 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());
+ runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.artifact.modes",
"Standalone,Cluster"));
scenarios = getScenarios(props);
governanceCenters =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.governance.centers"));
}
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 bfcc73dcdfb..31dcba40dcf 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
@@ -19,7 +19,7 @@
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.artifact.modes=Standalone,Cluster
+showprocesslist.e2e.artifact.modes=Standalone,Cluster
# showprocesslist.e2e.governance.center=Zookeeper
showprocesslist.e2e.governance.centers=Zookeeper
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
index b2c970a4e11..bd9d3e1c1f5 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
import org.apache.shardingsphere.test.e2e.sql.framework.type.SQLCommandType;
@@ -35,7 +35,7 @@ import java.util.LinkedList;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class E2ETestParameterFactory {
- private static final RunEnvironment ENV =
E2ETestEnvironment.getInstance().getRunEnvironment();
+ private static final ArtifactEnvironment ENV =
E2ETestEnvironment.getInstance().getArtifactEnvironment();
/**
* Get assertion test parameters.
@@ -87,6 +87,6 @@ public final class E2ETestParameterFactory {
* @return contains or not
*/
public static boolean containsTestParameter() {
- return
E2ETestEnvironment.getInstance().getRunEnvironment().getModes().stream().anyMatch(each
-> AdapterMode.STANDALONE == each || AdapterMode.CLUSTER == each);
+ return ENV.getModes().stream().anyMatch(each -> AdapterMode.STANDALONE
== each || AdapterMode.CLUSTER == each);
}
}
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 7ccdce5a396..71a0db5d6b3 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -18,14 +18,15 @@
#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
-#e2e.run.modes=Standalone,Cluster
-e2e.run.modes=
e2e.run.additional.cases=false
e2e.run.smoke.cases=false
# e2e.artifact.env.type=DOCKER,NATIVE
e2e.artifact.env.type=DOCKER
+#e2e.artifact.modes=Standalone,Cluster
+e2e.artifact.modes=
+
# e2e.artifact.adapters=jdbc,proxy
e2e.artifact.adapters=proxy
