This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 2973bcd600a Move proxy docker used global.yaml to container/proxy dir
(#37744)
2973bcd600a is described below
commit 2973bcd600aa737e949a4cd20f6af775fef12eb5
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Thu Jan 15 17:58:06 2026 +0800
Move proxy docker used global.yaml to container/proxy dir (#37744)
---
.../config/proxy/PipelineProxyContainerConfigurationFactory.java | 2 +-
.../src/test/resources/env/{ => container/proxy}/mariadb/global.yaml | 0
.../src/test/resources/env/{ => container/proxy}/mysql/global.yaml | 0
.../src/test/resources/env/{ => container/proxy}/opengauss/global.yaml | 0
.../src/test/resources/env/{ => container/proxy}/postgresql/global.yaml | 0
5 files changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
index 8b3264d4e1f..e33a9e2c2a8 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
@@ -53,7 +53,7 @@ public final class PipelineProxyContainerConfigurationFactory
{
private static Map<String, String> getMountedResource(final DatabaseType
databaseType) {
Map<String, String> result = new HashMap<>(2, 1F);
- result.put(String.format("env/%s/global.yaml",
databaseType.getType().toLowerCase()),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "global.yaml");
+ result.put(String.format("env/container/proxy/%s/global.yaml",
databaseType.getType().toLowerCase()),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "global.yaml");
result.put("env/logback.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
return result;
}
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/container/proxy/mariadb/global.yaml
similarity index 100%
rename from
test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
rename to
test/e2e/operation/pipeline/src/test/resources/env/container/proxy/mariadb/global.yaml
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/container/proxy/mysql/global.yaml
similarity index 100%
rename from test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
rename to
test/e2e/operation/pipeline/src/test/resources/env/container/proxy/mysql/global.yaml
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/container/proxy/opengauss/global.yaml
similarity index 100%
rename from
test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
rename to
test/e2e/operation/pipeline/src/test/resources/env/container/proxy/opengauss/global.yaml
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/container/proxy/postgresql/global.yaml
similarity index 100%
rename from
test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
rename to
test/e2e/operation/pipeline/src/test/resources/env/container/proxy/postgresql/global.yaml
