(shardingsphere) branch master updated: Move global.yaml to zookeeper folder (#36435)

[zhangliang]

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 88b1980393b Move global.yaml to zookeeper folder (#36435)
88b1980393b is described below

commit 88b1980393b05c51febd34740a06d0602154f0d1
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Aug 31 21:41:36 2025 +0800

    Move global.yaml to zookeeper folder (#36435)
    
    * Move global.yaml to zookeeper folder
    
    * Move global.yaml to zookeeper folder
    
    * Move global.yaml to zookeeper folder
---
 .../container/config/SQLE2EProxyContainerConfigurationFactory.java    | 4 +++-
 .../env/common/cluster/proxy/conf/{ => zookeeper}/global.yaml         | 0
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
index 0dd6d4342ac..36f769cc315 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
@@ -66,7 +66,9 @@ public final class SQLE2EProxyContainerConfigurationFactory {
         if (isScenarioGlobalYamlExists(scenario, modeType)) {
             return String.format("/env/scenario/%s/proxy/mode/%s/global.yaml", 
scenario, modeType);
         }
-        return String.format("/env/common/%s/proxy/conf/global.yaml", 
modeType);
+        return "cluster".equals(modeType)
+                ? String.format("/env/common/%s/proxy/conf/%s/global.yaml", 
modeType, E2ETestEnvironment.getInstance().getGovernanceCenter().toLowerCase())
+                : String.format("/env/common/%s/proxy/conf/global.yaml", 
modeType);
     }
     
     private static boolean isGovernanceCenterGlobalYamlExists(final String 
scenario, final String modeType) {
diff --git 
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/global.yaml 
b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
similarity index 100%
rename from 
test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/global.yaml
rename to 
test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml