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 326a7fc2dd1 Rename database image property from 'image' to 'images'
for E2E tests (#36737)
326a7fc2dd1 is described below
commit 326a7fc2dd1c642f0aec9f21d34be03fb9390849
Author: zhaojinchao <[email protected]>
AuthorDate: Sun Sep 28 16:56:47 2025 +0800
Rename database image property from 'image' to 'images' for E2E tests
(#36737)
* Rename database image property from 'image' to 'images' for E2E tests
* Update image to images
---
.github/workflows/e2e-operation.yml | 8 ++++----
.github/workflows/nightly-e2e-operation.yml | 24 +++++++++++-----------
.../test-manual/integration-test/_index.cn.md | 2 +-
.../test-manual/integration-test/_index.en.md | 2 +-
.../test-manual/pipeline-e2e-test/_index.cn.md | 4 ++--
.../test-manual/pipeline-e2e-test/_index.en.md | 4 ++--
.../container/adapter/AdapterContainerFactory.java | 4 ++--
.../e2e/env/runtime/type/DockerEnvironment.java | 2 +-
.../src/test/resources/env/e2e-env.properties | 12 +++++------
.../engine/ShowProcessListE2EIT.java | 4 ++--
.../src/test/resources/env/e2e-env.properties | 12 +++++------
.../sql/src/test/resources/env/e2e-env.properties | 2 +-
12 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/e2e-operation.yml
b/.github/workflows/e2e-operation.yml
index 39a797de317..e6b59462299 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: "e2e.docker.database.mysql.image", version:
"mysql:5.7" }, { type: "e2e.docker.database.postgresql.image", version:
"postgres:12-alpine" }, { type: "e2e.docker.database.mariadb.image", version:
"mariadb:11" } ]
+ image: [ { type: "e2e.docker.database.mysql.images", version:
"mysql:5.7" }, { type: "e2e.docker.database.postgresql.images", version:
"postgres:12-alpine" }, { type: "e2e.docker.database.mariadb.images", version:
"mariadb:11" } ]
exclude:
- operation: transaction
- image: { type: "e2e.docker.database.mariadb.image", version:
"mariadb:11" }
+ image: { type: "e2e.docker.database.mariadb.images", version:
"mariadb:11" }
- operation: showprocesslist
- image: { type: "e2e.docker.database.postgresql.image", version:
"postgres:12-alpine" }
+ image: { type: "e2e.docker.database.postgresql.images", version:
"postgres:12-alpine" }
- operation: showprocesslist
- image: { type: "e2e.docker.database.mariadb.image", version:
"mariadb:11" }
+ image: { type: "e2e.docker.database.mariadb.images", version:
"mariadb:11" }
steps:
- env:
changed_operations: ${{
needs.detect-changed-files.outputs.changed_operations }}
diff --git a/.github/workflows/nightly-e2e-operation.yml
b/.github/workflows/nightly-e2e-operation.yml
index 373c94eff6b..5c1415a7a50 100644
--- a/.github/workflows/nightly-e2e-operation.yml
+++ b/.github/workflows/nightly-e2e-operation.yml
@@ -47,24 +47,24 @@ jobs:
java-version: [ 11, 21 ]
operation: [ transaction, pipeline, showprocesslist ]
image: [
- { type: "e2e.docker.database.mysql.image", version: "mysql:5.7" },
- { type: "e2e.docker.database.mysql.image", version: "mysql:8.0" },
- { type: "e2e.docker.database.mariadb.image", version: "mariadb:11" },
- { type: "e2e.docker.database.postgresql.image", version:
"postgres:11-alpine" },
- { type: "e2e.docker.database.postgresql.image", version:
"postgres:12-alpine" },
- { type: "e2e.docker.database.postgresql.image", version:
"postgres:13-alpine" },
- { type: "e2e.docker.database.postgresql.image", version:
"postgres:14-alpine" },
- { type: "e2e.docker.database.opengauss.image", version:
"opengauss/opengauss:3.1.0" }
+ { type: "e2e.docker.database.mysql.images", version: "mysql:5.7" },
+ { type: "e2e.docker.database.mysql.images", version: "mysql:8.0" },
+ { type: "e2e.docker.database.mariadb.images", version: "mariadb:11"
},
+ { type: "e2e.docker.database.postgresql.images", version:
"postgres:11-alpine" },
+ { type: "e2e.docker.database.postgresql.images", version:
"postgres:12-alpine" },
+ { type: "e2e.docker.database.postgresql.images", version:
"postgres:13-alpine" },
+ { type: "e2e.docker.database.postgresql.images", version:
"postgres:14-alpine" },
+ { type: "e2e.docker.database.opengauss.images", version:
"opengauss/opengauss:3.1.0" }
]
exclude:
- operation: transaction
- image: { type: "e2e.docker.database.mariadb.image", version:
"mariadb:11" }
+ image: { type: "e2e.docker.database.mariadb.images", version:
"mariadb:11" }
- operation: showprocesslist
- image: { type: "e2e.docker.database.mariadb.image", version:
"mariadb:11" }
+ image: { type: "e2e.docker.database.mariadb.images", version:
"mariadb:11" }
- operation: showprocesslist
- image: { type: "e2e.docker.database.postgresql.image", version:
"postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine"
}
+ image: { type: "e2e.docker.database.postgresql.images", version:
"postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine"
}
- operation: showprocesslist
- image: { type: "e2e.docker.database.opengauss.image", version:
"opengauss/opengauss:3.1.0" }
+ image: { type: "e2e.docker.database.opengauss.images", version:
"opengauss/opengauss:3.1.0" }
steps:
- uses: actions/checkout@v4
- name: Retrieve Maven Caches
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 a181c9ff3cd..be93787b310 100644
--- a/docs/document/content/test-manual/integration-test/_index.cn.md
+++ b/docs/document/content/test-manual/integration-test/_index.cn.md
@@ -169,7 +169,7 @@ e2e.artifact.adapters=jdbc
e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
# 测试数据库的镜像版本
-e2e.docker.database.mysql.image=mysql:8.2.0
+e2e.docker.database.mysql.images=mysql:8.2.0
# NATIVE 模式下数据库连接信息及账号
e2e.native.database.host=127.0.0.1
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 b27b917d828..61554120bb3 100644
--- a/docs/document/content/test-manual/integration-test/_index.en.md
+++ b/docs/document/content/test-manual/integration-test/_index.en.md
@@ -168,7 +168,7 @@ e2e.artifact.adapters=jdbc
e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
# The docker image version of the database
-e2e.docker.database.mysql.image=mysql:8.2.0
+e2e.docker.database.mysql.images=mysql:8.2.0
# Database connection information and account in NATIVE mode
e2e.native.database.host=127.0.0.1
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 a3d366db366..55ddcdbb32b 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
@@ -92,11 +92,11 @@ e2e.native.database.password=root
```
e2e.run.type=DOCKER
-e2e.docker.database.mysql.image=mysql:5.7
+e2e.docker.database.mysql.images=mysql:5.7
```
3. 通过 Maven 运行测试用例。以 MySQL 为例：
```
-./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml
-De2e.run.type=docker -De2e.docker.database.mysql.image=mysql:5.7
+./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml
-De2e.run.type=docker -De2e.docker.database.mysql.images=mysql:5.7
```
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 4540eafbecd..8f78e199c8c 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
@@ -91,12 +91,12 @@ If only test code is modified, you could reuse the existing
docker image.
```
e2e.run.type=DOCKER
-e2e.docker.database.mysql.image=mysql:5.7
+e2e.docker.database.mysql.images=mysql:5.7
```
3. Run test cases.
Take MySQL as an example:
```
-./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml
-De2e.run.type=docker -De2e.docker.database.mysql.image=mysql:5.7
+./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml
-De2e.run.type=docker -De2e.docker.database.mysql.images=mysql:5.7
```
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 9d29bb689cd..2689711f256 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.ShardingSphereProxyEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
-import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment.Type;
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 RunEnvironment.Type.NATIVE.name().equalsIgnoreCase(envType)
+ return 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/DockerEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/DockerEnvironment.java
index 3e2b6b46fcb..7dd5936394b 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/DockerEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/DockerEnvironment.java
@@ -48,7 +48,7 @@ public final class DockerEnvironment {
Collection<DatabaseType> databaseTypes =
ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class);
Map<DatabaseType, Collection<String>> result = new
HashMap<>(databaseTypes.size(), 1F);
for (DatabaseType each : databaseTypes) {
- Collection<String> images =
EnvironmentPropertiesLoader.getListValue(props, "e2e.docker.database.%s.image");
+ Collection<String> images =
EnvironmentPropertiesLoader.getListValue(props,
"e2e.docker.database.%s.images");
if (!images.isEmpty()) {
result.put(each, images);
}
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 43854a468d9..52be77ab6df 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
@@ -17,12 +17,12 @@
#e2e.run.type=DOCKER,NATIVE
e2e.run.type=
-#e2e.docker.database.mysql.image=mysql:5.7,mysql:8.0
-e2e.docker.database.mysql.image=
-#e2e.docker.database.postgresql.image=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
-e2e.docker.database.postgresql.image=
-#e2e.docker.database.opengauss.image=opengauss/opengauss:3.1.0
-e2e.docker.database.opengauss.image=
+#e2e.docker.database.mysql.images=mysql:5.7,mysql:8.0
+e2e.docker.database.mysql.images=
+#e2e.docker.database.postgresql.images=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
+e2e.docker.database.postgresql.images=
+#e2e.docker.database.opengauss.images=opengauss/opengauss:3.1.0
+e2e.docker.database.opengauss.images=
#e2e.native.database.port= MySQL is 3306, PostgreSQL is 5432, openGauss is 5432
e2e.native.database.port=3306
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
index 58490309422..b2322ce9348 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.exception.external.sql.type.wrapper.SQLWr
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
-import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.container.composer.ClusterShowProcessListContainerComposer;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.parameter.ShowProcessListTestParameter;
import org.awaitility.Awaitility;
@@ -115,7 +115,7 @@ class ShowProcessListE2EIT {
}
private static boolean isEnabled() {
- return RunEnvironment.Type.DOCKER == ENV.getRunEnvironment().getType();
+ return Type.DOCKER == ENV.getRunEnvironment().getType();
}
private static final class TestCaseArgumentsProvider implements
ArgumentsProvider {
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 d106f154d00..54b445774f8 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
@@ -30,12 +30,12 @@ e2e.transaction.xa.providers=Atomikos,Narayana
#e2e.docker.proxy.port.bindings=63308:3308
-#e2e.docker.database.mysql.image=mysql:5.7,mysql:8.0
-e2e.docker.database.mysql.image=
-#e2e.docker.database.postgresql.image=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
-e2e.docker.database.postgresql.image=
-#e2e.docker.database.opengauss.image=opengauss/opengauss:3.1.0
-e2e.docker.database.opengauss.image=
+#e2e.docker.database.mysql.images=mysql:5.7,mysql:8.0
+e2e.docker.database.mysql.images=
+#e2e.docker.database.postgresql.images=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
+e2e.docker.database.postgresql.images=
+#e2e.docker.database.opengauss.images=opengauss/opengauss:3.1.0
+e2e.docker.database.opengauss.images=
e2e.native.database.host=127.0.0.1
e2e.native.database.port=3306
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 9f381055c2d..393c0a59f8b 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -36,7 +36,7 @@ e2e.artifact.regcenter=
#e2e.artifact.databases=MySQL,PostgreSQL,openGauss,Hive
e2e.artifact.databases=
-#e2e.docker.database.mysql.image=mysql:8.2.0
+#e2e.docker.database.mysql.images=mysql:8.2.0
#e2e.docker.proxy.port.bindings=63308:3308
