This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 594103e2240 Add env.runtime and env.container package (#19388)
594103e2240 is described below
commit 594103e2240b21a14e3c9f011664003397c7f1f8
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jul 20 15:03:02 2022 +0800
Add env.runtime and env.container package (#19388)
---
.../{ => env}/container/atomic/DockerITContainer.java | 2 +-
.../{ => env}/container/atomic/EmbeddedITContainer.java | 2 +-
.../integration/{ => env}/container/atomic/ITContainer.java | 2 +-
.../integration/{ => env}/container/atomic/ITContainers.java | 4 ++--
.../container/atomic/governance/GovernanceContainer.java | 4 ++--
.../atomic/governance/GovernanceContainerFactory.java | 4 ++--
.../container/atomic/governance/impl/ZookeeperContainer.java | 4 ++--
.../{ => env}/container/atomic/storage/StorageContainer.java | 4 ++--
.../{ => env}/container/wait/JDBCConnectionWaitStrategy.java | 2 +-
.../integration/env/{ => runtime}/DataSourceEnvironment.java | 2 +-
.../env/{ => runtime}/cluster/ClusterEnvironment.java | 2 +-
.../integration/data/pipeline/cases/base/BaseITCase.java | 2 +-
.../data/pipeline/cases/general/CreateTableSQLGeneratorIT.java | 2 +-
.../framework/container/cluster/ZookeeperContainer.java | 2 +-
.../framework/container/compose/BaseComposedContainer.java | 2 +-
.../framework/container/compose/DockerComposedContainer.java | 4 ++--
.../framework/container/compose/NativeComposedContainer.java | 2 +-
.../framework/container/database/DatabaseContainer.java | 2 +-
.../pipeline/framework/container/database/MySQLContainer.java | 4 ++--
.../framework/container/database/OpenGaussContainer.java | 4 ++--
.../framework/container/database/PostgreSQLContainer.java | 4 ++--
.../container/proxy/ShardingSphereProxyDockerContainer.java | 6 +++---
.../src/test/resources/logback-test.xml | 2 +-
.../integration/container/atomic/adapter/AdapterContainer.java | 2 +-
.../container/atomic/adapter/AdapterContainerFactory.java | 2 +-
.../atomic/adapter/impl/ShardingSphereJDBCContainer.java | 4 ++--
.../adapter/impl/ShardingSphereProxyClusterContainer.java | 6 +++---
.../adapter/impl/ShardingSphereProxyStandaloneContainer.java | 6 +++---
.../container/atomic/storage/DockerStorageContainer.java | 5 +++--
.../container/atomic/storage/EmbeddedStorageContainer.java | 5 +++--
.../container/atomic/storage/StorageContainerFactory.java | 1 +
.../container/atomic/storage/impl/PostgreSQLContainer.java | 2 +-
.../container/compose/mode/ClusterComposedContainer.java | 10 +++++-----
.../container/compose/mode/StandaloneComposedContainer.java | 6 +++---
.../test/integration/env/IntegrationTestEnvironment.java | 2 +-
.../runner/ShardingSphereIntegrationTestParameterized.java | 2 +-
36 files changed, 62 insertions(+), 59 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/DockerITContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/DockerITContainer.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/DockerITContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/DockerITContainer.java
index c3d93b84600..9cb7ff22709 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/DockerITContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/DockerITContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.atomic;
+package org.apache.shardingsphere.test.integration.env.container.atomic;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/EmbeddedITContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/EmbeddedITContainer.java
similarity index 92%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/EmbeddedITContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/EmbeddedITContainer.java
index 1ba933bd1e2..3100d699445 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/EmbeddedITContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/EmbeddedITContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.atomic;
+package org.apache.shardingsphere.test.integration.env.container.atomic;
/**
* Embedded IT container.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/ITContainer.java
similarity index 93%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/ITContainer.java
index 0a89c5734db..da2160de4b4 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/ITContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.atomic;
+package org.apache.shardingsphere.test.integration.env.container.atomic;
import org.testcontainers.lifecycle.Startable;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainers.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/ITContainers.java
similarity index 96%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainers.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/ITContainers.java
index d5def91dfbe..8c94a228927 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/ITContainers.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/ITContainers.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.atomic;
+package org.apache.shardingsphere.test.integration.env.container.atomic;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.integration.container.atomic.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.GovernanceContainer;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.output.Slf4jLogConsumer;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/GovernanceContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainer.java
similarity index 87%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/GovernanceContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainer.java
index 185f5261518..1a7da291c0e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/GovernanceContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.atomic.governance;
+package
org.apache.shardingsphere.test.integration.env.container.atomic.governance;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
/**
* Governance container.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/GovernanceContainerFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainerFactory.java
similarity index 88%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/GovernanceContainerFactory.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainerFactory.java
index 5900e40d750..a4a9a96844c 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/GovernanceContainerFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainerFactory.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.atomic.governance;
+package
org.apache.shardingsphere.test.integration.env.container.atomic.governance;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.integration.container.atomic.governance.impl.ZookeeperContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.impl.ZookeeperContainer;
/**
* Governance container factory.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/impl/ZookeeperContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/impl/ZookeeperContainer.java
similarity index 88%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/impl/ZookeeperContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/impl/ZookeeperContainer.java
index 229d190e2a5..f49d5c80064 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/governance/impl/ZookeeperContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/impl/ZookeeperContainer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.integration.container.atomic.governance.impl;
+package
org.apache.shardingsphere.test.integration.env.container.atomic.governance.impl;
-import
org.apache.shardingsphere.test.integration.container.atomic.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.GovernanceContainer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
/**
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/StorageContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainer.java
similarity index 88%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/StorageContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainer.java
index 1d06ac5d52d..a8f36e7cffe 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/StorageContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.atomic.storage;
+package
org.apache.shardingsphere.test.integration.env.container.atomic.storage;
-import org.apache.shardingsphere.test.integration.container.atomic.ITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.ITContainer;
import javax.sql.DataSource;
import java.util.Map;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/wait/JDBCConnectionWaitStrategy.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/wait/JDBCConnectionWaitStrategy.java
similarity index 96%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/wait/JDBCConnectionWaitStrategy.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/wait/JDBCConnectionWaitStrategy.java
index f7032ce0ac7..9d74357e3b4 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/container/wait/JDBCConnectionWaitStrategy.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/wait/JDBCConnectionWaitStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.container.wait;
+package org.apache.shardingsphere.test.integration.env.container.wait;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/DataSourceEnvironment.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/DataSourceEnvironment.java
similarity index 98%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/DataSourceEnvironment.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/DataSourceEnvironment.java
index ce683c36484..b2605e7b87e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/DataSourceEnvironment.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/DataSourceEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.env;
+package org.apache.shardingsphere.test.integration.env.runtime;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/cluster/ClusterEnvironment.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/cluster/ClusterEnvironment.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/cluster/ClusterEnvironment.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/cluster/ClusterEnvironment.java
index aed2a84a2c2..d0811052fb8 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/cluster/ClusterEnvironment.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/runtime/cluster/ClusterEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.env.cluster;
+package org.apache.shardingsphere.test.integration.env.runtime.cluster;
import com.google.common.base.Splitter;
import lombok.Getter;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
index 1ad7e011ca0..9910c968372 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
@@ -40,7 +40,7 @@ import
org.apache.shardingsphere.integration.data.pipeline.framework.helper.Scal
import
org.apache.shardingsphere.integration.data.pipeline.framework.param.ScalingParameterized;
import
org.apache.shardingsphere.integration.data.pipeline.framework.watcher.ScalingWatcher;
import
org.apache.shardingsphere.integration.data.pipeline.util.DatabaseTypeUtil;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
import org.junit.Rule;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/general/CreateTableSQLGeneratorIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/general/CreateTableSQLGeneratorIT.java
index 7be7be51937..5b7919aca91 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/general/CreateTableSQLGeneratorIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/general/CreateTableSQLGeneratorIT.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.integration.data.pipeline.env.enums.ScalingITEn
import
org.apache.shardingsphere.integration.data.pipeline.factory.DatabaseContainerFactory;
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.database.DatabaseContainer;
import
org.apache.shardingsphere.integration.data.pipeline.framework.param.ScalingParameterized;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java
index 5dd47f38a80..f0106fd69dd 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/cluster/ZookeeperContainer.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.integration.data.pipeline.framework.container.cluster;
-import
org.apache.shardingsphere.test.integration.container.atomic.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.GovernanceContainer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
/**
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseComposedContainer.java
index 201af433401..d267cbdd0d5 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseComposedContainer.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.integration.data.pipeline.framework.container.compose;
import lombok.Getter;
-import
org.apache.shardingsphere.test.integration.container.atomic.ITContainers;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.ITContainers;
import org.testcontainers.lifecycle.Startable;
@Getter
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
index 1d49b19fead..a48de0086ed 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.integration.data.pipeline.factory.DatabaseConta
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.cluster.ZookeeperContainer;
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.database.DatabaseContainer;
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.proxy.ShardingSphereProxyDockerContainer;
-import
org.apache.shardingsphere.test.integration.container.atomic.governance.GovernanceContainer;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
/**
* Composed container, include governance container and database container.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeComposedContainer.java
index 43c3c45bb7d..c3bdb5f38c5 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeComposedContainer.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.metadata.url.JdbcUrlAppender;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.integration.data.pipeline.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/DatabaseContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/DatabaseContainer.java
index 83719c2e760..44bbfab03c0 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/DatabaseContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/DatabaseContainer.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.integration.data.pipeline.framework.container.
import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
/**
* Docker storage container.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java
index 004f319f773..b572961543d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/MySQLContainer.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.integration.data.pipeline.framework.container.
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
-import
org.apache.shardingsphere.test.integration.container.wait.JDBCConnectionWaitStrategy;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.wait.JDBCConnectionWaitStrategy;
import org.testcontainers.containers.BindMode;
import java.sql.DriverManager;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java
index 46a32de71bc..2669de72821 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/OpenGaussContainer.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.integration.data.pipeline.framework.container.
import org.apache.commons.lang3.StringUtils;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
-import
org.apache.shardingsphere.test.integration.container.wait.JDBCConnectionWaitStrategy;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.wait.JDBCConnectionWaitStrategy;
import org.testcontainers.containers.BindMode;
import java.sql.DriverManager;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java
index edb115398ae..baaa749cdb2 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/database/PostgreSQLContainer.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.integration.data.pipeline.framework.container.
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
-import
org.apache.shardingsphere.test.integration.container.wait.JDBCConnectionWaitStrategy;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.wait.JDBCConnectionWaitStrategy;
import org.testcontainers.containers.BindMode;
import java.sql.DriverManager;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java
index 996a47813e7..9b4726783f0 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/proxy/ShardingSphereProxyDockerContainer.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.integration.data.pipeline.framework.container.
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.integration.data.pipeline.util.DatabaseTypeUtil;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.integration.container.wait.JDBCConnectionWaitStrategy;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.wait.JDBCConnectionWaitStrategy;
import org.testcontainers.containers.BindMode;
import java.sql.DriverManager;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
index 5b1f8baab58..51baa22fcda 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
@@ -23,7 +23,7 @@
<pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread]
%logger{36} - %msg%n</pattern>
</encoder>
</appender>
- <logger
name="org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer"
level="WARN" />
+ <logger
name="org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer"
level="WARN" />
<logger name="com.zaxxer.hikari.pool.ProxyConnection" level="OFF" />
<logger name="com.github.dockerjava" level="WARN"/>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainer.java
index 37575680cb2..d0eb0d52fd1 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainer.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.integration.container.atomic.adapter;
-import org.apache.shardingsphere.test.integration.container.atomic.ITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.ITContainer;
import javax.sql.DataSource;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainerFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainerFactory.java
index 986740f2149..ac4fd4a470e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainerFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/AdapterContainerFactory.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.impl.ShardingSphereJDBCContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.impl.ShardingSphereProxyStandaloneContainer;
-import
org.apache.shardingsphere.test.integration.container.atomic.storage.StorageContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
/**
* Adapter container factory.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java
index 2a797461f69..efcc0139769 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereJDBCContainer.java
@@ -24,9 +24,9 @@ import
org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlModeConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlPersistRepositoryConfiguration;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
-import
org.apache.shardingsphere.test.integration.container.atomic.EmbeddedITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.EmbeddedITContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.integration.container.atomic.storage.StorageContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.integration.env.scenario.path.ScenarioCommonPath;
import javax.sql.DataSource;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index 9f72bc30da2..29f56fcc499 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.test.integration.container.atomic.adapter.impl
import com.zaxxer.hikari.HikariDataSource;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.integration.container.wait.JDBCConnectionWaitStrategy;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.wait.JDBCConnectionWaitStrategy;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index bc95f27b30a..bc507b7ddc9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -20,10 +20,10 @@ package
org.apache.shardingsphere.test.integration.container.atomic.adapter.impl
import com.zaxxer.hikari.HikariDataSource;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.integration.container.wait.JDBCConnectionWaitStrategy;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.wait.JDBCConnectionWaitStrategy;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/DockerStorageContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/DockerStorageContainer.java
index 0ba9fb80319..8207d102cdf 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/DockerStorageContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/DockerStorageContainer.java
@@ -21,11 +21,12 @@ import com.zaxxer.hikari.HikariDataSource;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.integration.env.scenario.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.integration.env.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.integration.env.scenario.path.ScenarioDataPath.Type;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/EmbeddedStorageContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/EmbeddedStorageContainer.java
index 5dbbb0c5fa7..660cb1bab76 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/EmbeddedStorageContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/EmbeddedStorageContainer.java
@@ -21,8 +21,9 @@ import com.zaxxer.hikari.HikariDataSource;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.test.integration.container.atomic.EmbeddedITContainer;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.EmbeddedITContainer;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.integration.env.scenario.database.DatabaseEnvironmentManager;
import javax.sql.DataSource;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/StorageContainerFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/StorageContainerFactory.java
index d55004ab651..4e1788a7ef1 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/StorageContainerFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/StorageContainerFactory.java
@@ -23,6 +23,7 @@ import
org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.container.atomic.storage.impl.H2Container;
import
org.apache.shardingsphere.test.integration.container.atomic.storage.impl.MySQLContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.storage.impl.PostgreSQLContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
/**
* Storage container factory.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java
index 871803f79ac..e35dd5fe09d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/atomic/storage/impl/PostgreSQLContainer.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.integration.container.atomic.storage.impl
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.integration.container.atomic.storage.DockerStorageContainer;
import org.postgresql.util.PSQLException;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
index 29791e87c94..75ad2c0b107 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.test.integration.container.compose.mode;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.integration.container.atomic.ITContainers;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.ITContainers;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.AdapterContainerFactory;
-import
org.apache.shardingsphere.test.integration.container.atomic.governance.GovernanceContainer;
-import
org.apache.shardingsphere.test.integration.container.atomic.governance.GovernanceContainerFactory;
-import
org.apache.shardingsphere.test.integration.container.atomic.storage.StorageContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.GovernanceContainerFactory;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.integration.container.compose.ComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
index edf6958df0f..bddae471f85 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
@@ -17,11 +17,11 @@
package org.apache.shardingsphere.test.integration.container.compose.mode;
-import
org.apache.shardingsphere.test.integration.container.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.integration.container.atomic.ITContainers;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.ITContainers;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.adapter.AdapterContainerFactory;
-import
org.apache.shardingsphere.test.integration.container.atomic.storage.StorageContainer;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.integration.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.integration.container.compose.ComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
index ebf04645d43..fdd55bffb00 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.env;
import com.google.common.base.Splitter;
import lombok.Getter;
-import
org.apache.shardingsphere.test.integration.env.cluster.ClusterEnvironment;
+import
org.apache.shardingsphere.test.integration.env.runtime.cluster.ClusterEnvironment;
import
org.apache.shardingsphere.test.integration.env.scenario.path.ScenarioCommonPath;
import java.io.IOException;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java
index ba74683e40c..0e71500d789 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.integration.framework.runner;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.test.integration.env.cluster.ClusterEnvironment;
+import
org.apache.shardingsphere.test.integration.env.runtime.cluster.ClusterEnvironment;
import
org.apache.shardingsphere.test.integration.framework.runner.parallel.ParallelRunnerScheduler;
import
org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
import org.junit.runners.Parameterized;
