You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/04/18 11:34:26 UTC
[shardingsphere] branch master updated: Prepare for scaling integration test (#16901)
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 0fc1968e263 Prepare for scaling integration test (#16901)
0fc1968e263 is described below
commit 0fc1968e2632f95159d9e7120d674fb2efbca8f1
Author: Hongsheng Zhong <sa...@126.com>
AuthorDate: Mon Apr 18 19:34:19 2022 +0800
Prepare for scaling integration test (#16901)
* Add shardingsphere-integration-test-env module
* Move some common classes of framework/container to shardingsphere-integration-test-env module
* Merge and move shardingsphere-integration-test-scaling module
* Add Scaling Integration Test workflow, stage 1
* Limit CI and IT triggering from .github/workflows/
* Add steps
* Add license header
---
.github/workflows/ci.yml | 4 +-
.github/workflows/it-scaling.yml | 68 ++++++++
.github/workflows/it.yml | 8 +-
shardingsphere-test/pom.xml | 1 -
.../Dockerfile | 27 ----
.../pom.xml | 178 ---------------------
.../src/test/assembly/bin/start.sh | 78 ---------
.../src/test/assembly/bin/stop.sh | 51 ------
.../assembly/shardingsphere-scaling-assembly.xml | 44 -----
.../src/test/resources/docker/docker-compose.yml | 72 ---------
.../test/resources/docker/scaling/conf/server.yaml | 24 ---
.../shardingsphere-integration-test/pom.xml | 2 +
.../shardingsphere-integration-test-env}/pom.xml | 37 +++--
.../integration/env/DataSourceEnvironment.java | 0
.../env/cluster/ClusterEnvironment.java | 0
.../container/atomic/DockerITContainer.java | 0
.../container/atomic/EmbeddedITContainer.java | 0
.../framework/container/atomic/ITContainer.java | 0
.../framework/container/atomic/ITContainers.java | 0
.../atomic/governance/GovernanceContainer.java | 0
.../governance/GovernanceContainerFactory.java | 0
.../atomic/governance/impl/ZookeeperContainer.java | 0
.../container/atomic/storage/StorageContainer.java | 0
.../pom.xml | 1 +
.../pom.xml | 49 +++---
.../integration/scaling/test/mysql/ScalingIT.java | 0
.../test/mysql/env/ITEnvironmentContext.java | 0
.../test/mysql/env/IntegrationTestEnvironment.java | 0
.../scaling/test/mysql/env/cases/DataSet.java | 0
.../scaling/test/mysql/env/cases/Type.java | 0
.../test/mysql/env/config/SourceConfiguration.java | 0
.../test/mysql/env/config/TargetConfiguration.java | 0
.../scaling/test/mysql/fixture/DataImporter.java | 0
.../scaling/test/mysql/util/ExecuteUtil.java | 0
.../scaling/test/mysql/util/Executor.java | 0
.../scaling/test/mysql/util/ScalingUtil.java | 0
.../src/test/resources/cases/mysql/types.xml | 0
.../src/test/resources/env/engine-env.properties | 0
.../src/test/resources/env/mysql/init.sql | 0
.../shardingsphere-integration-test-suite/pom.xml | 6 +
40 files changed, 134 insertions(+), 516 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55762fe1c86..f00ddfc07f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ on:
push:
branches: [ master, dev ]
paths:
- - '.github/workflows/**'
+ - '.github/workflows/ci.yml'
- '**/pom.xml'
- '**/src/main/**'
- '**/src/test/**'
@@ -35,7 +35,7 @@ on:
pull_request:
branches: [ master ]
paths:
- - '.github/workflows/**'
+ - '.github/workflows/ci.yml'
- '**/pom.xml'
- '**/src/main/**'
- '**/src/test/**'
diff --git a/.github/workflows/it-scaling.yml b/.github/workflows/it-scaling.yml
new file mode 100644
index 00000000000..533fca3cc9d
--- /dev/null
+++ b/.github/workflows/it-scaling.yml
@@ -0,0 +1,68 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Scaling Integration Test
+
+on:
+ push:
+ branches: [ master, dev ]
+ paths:
+ - '.github/workflows/it-scaling.yml'
+ - 'shardingsphere-infra/shardingsphere-infra-common/src/main/**/datasource/**'
+ - 'shardingsphere-kernel/shardingsphere-data-pipeline/**'
+ - 'shardingsphere-kernel/shardingsphere-data-pipeline/**/src/test/**'
+ - 'shardingsphere-features/**/src/main/**/scaling/**'
+ - 'shardingsphere-features/**/src/main/**/sharding/schedule/**'
+ - 'shardingsphere-features/**/src/main/resources/META-INF/services/*.data.pipeline.*'
+ - 'shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/**/*Pipeline*.java'
+ - 'shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/*.data.pipeline.*'
+ - '!shardingsphere-test/**'
+ - 'shardingsphere-test/shardingsphere-integration-test/**'
+ - '!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/**'
+ - '!*.md'
+ pull_request:
+ branches: [ master ]
+ paths:
+ - '.github/workflows/it-scaling.yml'
+ - 'shardingsphere-infra/shardingsphere-infra-common/src/main/**/datasource/**'
+ - 'shardingsphere-kernel/shardingsphere-data-pipeline/**'
+ - 'shardingsphere-kernel/shardingsphere-data-pipeline/**/src/test/**'
+ - 'shardingsphere-features/**/src/main/**/scaling/**'
+ - 'shardingsphere-features/**/src/main/**/sharding/schedule/**'
+ - 'shardingsphere-features/**/src/main/resources/META-INF/services/*.data.pipeline.*'
+ - 'shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/**/*Pipeline*.java'
+ - 'shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/*.data.pipeline.*'
+ - '!shardingsphere-test/**'
+ - 'shardingsphere-test/shardingsphere-integration-test/**'
+ - '!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/**'
+ - '!*.md'
+
+concurrency:
+ group: it-scaling-${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+env:
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+
+jobs:
+ empty:
+ if: github.ref == 'xxx'
+ name: empty
+ runs-on: ubuntu-latest
+ steps:
+ - name: Empty
+ run: echo "empty"
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index b223d4d6802..ca2bb5db0c8 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -21,7 +21,7 @@ on:
push:
branches: [ master, dev ]
paths:
- - '.github/workflows/**'
+ - '.github/workflows/it.yml'
- '**/pom.xml'
- '**/src/main/**'
- '!examples/**'
@@ -31,12 +31,13 @@ on:
- '!shardingsphere-kernel/shardingsphere-data-pipeline/**'
- '!shardingsphere-test/**'
- 'shardingsphere-test/shardingsphere-integration-test/**'
+ - '!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/**'
- 'shardingsphere-test/shardingsphere-integration-agent-test/**'
- '!*.md'
pull_request:
branches: [ master ]
paths:
- - '.github/workflows/**'
+ - '.github/workflows/it.yml'
- '**/pom.xml'
- '**/src/main/**'
- '!examples/**'
@@ -46,11 +47,12 @@ on:
- '!shardingsphere-kernel/shardingsphere-data-pipeline/**'
- '!shardingsphere-test/**'
- 'shardingsphere-test/shardingsphere-integration-test/**'
+ - '!shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/**'
- 'shardingsphere-test/shardingsphere-integration-agent-test/**'
- '!*.md'
concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
+ group: it-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
diff --git a/shardingsphere-test/pom.xml b/shardingsphere-test/pom.xml
index 5da106137da..a4866822879 100644
--- a/shardingsphere-test/pom.xml
+++ b/shardingsphere-test/pom.xml
@@ -32,7 +32,6 @@
<module>shardingsphere-integration-test</module>
<module>shardingsphere-integration-driver-test</module>
<module>shardingsphere-integration-agent-test</module>
- <module>shardingsphere-integration-scaling-test</module>
<module>shardingsphere-rewrite-test</module>
<module>shardingsphere-parser-test</module>
<module>shardingsphere-optimize-test</module>
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/Dockerfile b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/Dockerfile
deleted file mode 100644
index 8f607211d0a..00000000000
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FROM openjdk:8-jdk-alpine
-
-ARG APP_NAME
-ENV WAIT_VERSION 2.7.2
-
-ADD https://github.com/ufoscout/docker-compose-wait/releases/download/$WAIT_VERSION/wait /wait
-RUN chmod +x /wait
-ADD target/${APP_NAME}.tar.gz /opt
-RUN mv /opt/${APP_NAME} /opt/shardingsphere-scaling
-ENTRYPOINT /wait && /opt/shardingsphere-scaling/bin/start.sh && tail -f /opt/shardingsphere-scaling/logs/stdout.log
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/pom.xml b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/pom.xml
deleted file mode 100644
index 520fdbf2677..00000000000
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/pom.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-integration-scaling-test</artifactId>
- <version>5.1.2-SNAPSHOT</version>
- </parent>
- <artifactId>shardingsphere-integration-scaling-test-mysql</artifactId>
- <name>${project.artifactId}</name>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <okhttp.version>3.7.0</okhttp.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-data-pipeline-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>it.env.scaling</id>
- <properties>
- <it.env>scaling</it.env>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/test/assembly/shardingsphere-scaling-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>shardingsphere-scaling-bin</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <repository>apache/shardingsphere-scaling-test</repository>
- <tag>${project.version}</tag>
- <tag>latest</tag>
- <buildArgs>
- <APP_NAME>${project.build.finalName}</APP_NAME>
- </buildArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.dkanejs.maven.plugins</groupId>
- <artifactId>docker-compose-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>agent-metrics-up</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>up</goal>
- </goals>
- <configuration>
- <composeFile>${project.basedir}/src/test/resources/docker/docker-compose.yml</composeFile>
- <detachedMode>true</detachedMode>
- </configuration>
- </execution>
- <execution>
- <id>agent-metrics-down</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>down</goal>
- </goals>
- <configuration>
- <composeFile>${project.basedir}/src/test/resources/docker/docker-compose.yml</composeFile>
- <removeVolumes>true</removeVolumes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-tests</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/test-classes</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/bin/start.sh b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/bin/start.sh
deleted file mode 100644
index 3ebb0b8b231..00000000000
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/bin/start.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-SERVER_NAME=ShardingSphere-Scaling
-
-cd `dirname $0`
-cd ..
-DEPLOY_DIR=`pwd`
-
-LOGS_DIR=${DEPLOY_DIR}/logs
-if [ ! -d ${LOGS_DIR} ]; then
- mkdir ${LOGS_DIR}
-fi
-
-STDOUT_FILE=${LOGS_DIR}/stdout.log
-EXT_LIB=${DEPLOY_DIR}/ext-lib
-
-CLASS_PATH=.:${DEPLOY_DIR}/lib/*:${EXT_LIB}/*
-
-JAVA_OPTS=" -Djava.awt.headless=true -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=3308"
-
-JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn1g -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
-
-if [ "server" = "${BOOTSTRAP_TYPE}" ]; then
- MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingServerBootstrap
-elif [ "worker" = "${BOOTSTRAP_TYPE}" ]; then
- MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingWorkerBootstrap
-else
- echo 'Please set the BOOTSTRAP_TYPE(server/worker) in the environment variable'
- exit 1
-fi
-
-print_usage() {
- echo "usage: start.sh [port] [config_dir]"
- echo " port: scaling listen port, default is 8888"
- echo " config_dir: scaling config directory, default is conf"
- exit 0
-}
-
-if [ "$1" == "-h" ] || [ "$1" == "--help" ] ; then
- print_usage
-fi
-
-echo "Starting the $SERVER_NAME ..."
-
-if [ $# == 1 ]; then
- MAIN_CLASS=${MAIN_CLASS}" "$1
- echo "The port is $1"
- CLASS_PATH=${DEPLOY_DIR}/conf:${CLASS_PATH}
-fi
-
-if [ $# == 2 ]; then
- MAIN_CLASS=${MAIN_CLASS}" "$1" "$2
- echo "The port is $1"
- echo "The configuration path is $DEPLOY_DIR/$2"
- CLASS_PATH=${DEPLOY_DIR}/$2:${CLASS_PATH}
-fi
-
-echo "The classpath is ${CLASS_PATH}"
-
-nohup java ${JAVA_OPTS} ${JAVA_MEM_OPTS} -classpath ${CLASS_PATH} ${MAIN_CLASS} >> ${STDOUT_FILE} 2>&1 &
-sleep 1
-echo "Please check the STDOUT file: $STDOUT_FILE"
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/bin/stop.sh b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/bin/stop.sh
deleted file mode 100644
index 132e2f16ae1..00000000000
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/bin/stop.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-SERVER_NAME=ShardingSphere-Scaling
-
-cd `dirname $0`
-cd ..
-DEPLOY_DIR=`pwd`
-
-PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | grep -v grep |awk '{print $2}'`
-if [ -z "$PIDS" ]; then
- echo "ERROR: The $SERVER_NAME does not started!"
- exit 1
-fi
-
-echo -e "Stopping the $SERVER_NAME ...\c"
-for PID in ${PIDS} ; do
- kill ${PID} > /dev/null 2>&1
-done
-
-COUNT=0
-while [ ${COUNT} -lt 1 ]; do
- echo -e ".\c"
- sleep 1
- COUNT=1
- for PID in ${PIDS} ; do
- PID_EXIST=`ps -f -p ${PID} | grep java`
- if [ -n "$PID_EXIST" ]; then
- COUNT=0
- break
- fi
- done
-done
-
-echo "OK!"
-echo "PID: $PIDS"
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/shardingsphere-scaling-assembly.xml b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/shardingsphere-scaling-assembly.xml
deleted file mode 100644
index 6dadef1ab60..00000000000
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/assembly/shardingsphere-scaling-assembly.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>shardingsphere-scaling-bin</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>src/test/assembly/bin</directory>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>*.sh</include>
- </includes>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <fileMode>0644</fileMode>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/docker-compose.yml
deleted file mode 100644
index 6c6a7499204..00000000000
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/docker-compose.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-version: "2.1"
-
-services:
- mysql:
- image: "mysql/mysql-server:5.7"
- container_name: scaling-mysql
- command: ['--server-id=1', '--log_bin=mysql-bin']
- volumes:
- - ../env/mysql:/docker-entrypoint-initdb.d/
- ports:
- - "13306:3306"
- environment:
- - LANG=C.UTF-8
-
- zookeeper:
- image: "zookeeper:3.6.2"
- container_name: scaling-zookeeper
- ports:
- - "12181:2181"
-
- shardingsphere-scaling-server:
- image: apache/shardingsphere-scaling-test
- container_name: shardingsphere-scaling-server
- ports:
- - "18888:8888"
- links:
- - "mysql:scaling-mysql"
- - "zookeeper:scaling-zookeeper"
- volumes:
- - ./scaling/conf:/opt/shardingsphere-scaling/conf
- depends_on:
- - zookeeper
- environment:
- - WAIT_HOSTS=mysql:3306,zookeeper:2181
- - WAIT_HOSTS_TIMEOUT=300
- - WAIT_SLEEP_INTERVAL=5
- - WAIT_HOST_CONNECT_TIMEOUT=30
- - BOOTSTRAP_TYPE=server
-
- shardingsphere-scaling-worker:
- image: apache/shardingsphere-scaling-test
- container_name: shardingsphere-scaling-worker
- links:
- - "mysql:scaling-mysql"
- - "zookeeper:scaling-zookeeper"
- volumes:
- - ./scaling/conf:/opt/shardingsphere-scaling/conf
- depends_on:
- - zookeeper
- environment:
- - WAIT_HOSTS=mysql:3306,zookeeper:2181
- - WAIT_HOSTS_TIMEOUT=300
- - WAIT_SLEEP_INTERVAL=5
- - WAIT_HOST_CONNECT_TIMEOUT=30
- - BOOTSTRAP_TYPE=worker
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/scaling/conf/server.yaml b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/scaling/conf/server.yaml
deleted file mode 100644
index 3585eb38761..00000000000
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/docker/scaling/conf/server.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-mode:
- type: Cluster
- repository:
- type: ZooKeeper
- props:
- namespace: governance_ds
- server-lists: localhost:2181
diff --git a/shardingsphere-test/shardingsphere-integration-test/pom.xml b/shardingsphere-test/shardingsphere-integration-test/pom.xml
index 6e9acd08b25..aaecf86367b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/pom.xml
@@ -29,7 +29,9 @@
<modules>
<module>shardingsphere-integration-test-fixture</module>
+ <module>shardingsphere-integration-test-env</module>
<module>shardingsphere-integration-test-suite</module>
+ <module>shardingsphere-integration-test-scaling</module>
</modules>
<properties>
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/pom.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/pom.xml
similarity index 58%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/pom.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/pom.xml
index 552125df49c..7b9a7419b45 100644
--- a/shardingsphere-test/shardingsphere-integration-scaling-test/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/pom.xml
@@ -16,35 +16,48 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>shardingsphere-test</artifactId>
+ <artifactId>shardingsphere-integration-test</artifactId>
<groupId>org.apache.shardingsphere</groupId>
<version>5.1.2-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-integration-scaling-test</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-integration-test-env</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>shardingsphere-integration-scaling-test-mysql</module>
- </modules>
-
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
+ <artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <id>integration-tests</id>
<goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
+ <goal>test-jar</goal>
</goals>
</execution>
</executions>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/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/DataSourceEnvironment.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/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/DataSourceEnvironment.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/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/cluster/ClusterEnvironment.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/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/cluster/ClusterEnvironment.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/DockerITContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/DockerITContainer.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/DockerITContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/DockerITContainer.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/EmbeddedITContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/EmbeddedITContainer.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/EmbeddedITContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/EmbeddedITContainer.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainer.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainer.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainers.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainers.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainers.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/ITContainers.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainer.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainer.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainerFactory.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainerFactory.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainerFactory.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/GovernanceContainerFactory.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/impl/ZookeeperContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/governance/impl/ZookeeperContainer.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/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/framework/container/atomic/governance/impl/ZookeeperContainer.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
index aee87718caa..0c6b9e0b8e0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
@@ -27,6 +27,7 @@
<name>${project.artifactId}</name>
<properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
<dockerfile.skip.build>true</dockerfile.skip.build>
</properties>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
similarity index 74%
copy from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
copy to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
index 68ce76a0591..a0772ed9ee7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
@@ -23,47 +23,50 @@
<artifactId>shardingsphere-integration-test</artifactId>
<version>5.1.2-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-integration-test-suite</artifactId>
+ <artifactId>shardingsphere-integration-test-scaling</artifactId>
<name>${project.artifactId}</name>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-integration-test-fixture</artifactId>
+ <artifactId>shardingsphere-data-pipeline-core</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-jdbc-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -88,5 +91,3 @@
</plugins>
</build>
</project>
-
-
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/ScalingIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/ScalingIT.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/ScalingIT.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/ScalingIT.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/ITEnvironmentContext.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/IntegrationTestEnvironment.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/IntegrationTestEnvironment.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/IntegrationTestEnvironment.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/IntegrationTestEnvironment.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/DataSet.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/DataSet.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/DataSet.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/DataSet.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/Type.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/Type.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/Type.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/cases/Type.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/fixture/DataImporter.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/fixture/DataImporter.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/fixture/DataImporter.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/fixture/DataImporter.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ExecuteUtil.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ExecuteUtil.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ExecuteUtil.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ExecuteUtil.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/Executor.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/Executor.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/Executor.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/Executor.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ScalingUtil.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ScalingUtil.java
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ScalingUtil.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/util/ScalingUtil.java
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/cases/mysql/types.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/cases/mysql/types.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/cases/mysql/types.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/cases/mysql/types.xml
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/env/engine-env.properties b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/engine-env.properties
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/env/engine-env.properties
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/engine-env.properties
diff --git a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/env/mysql/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/init.sql
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/resources/env/mysql/init.sql
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/init.sql
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
index 68ce76a0591..ad8064828ea 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
@@ -33,6 +33,12 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-integration-test-env</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.postgresql</groupId>