This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2dedf8ce1f [IOTDB-3138] Remove old cluster module from distribution
package (#5853)
2dedf8ce1f is described below
commit 2dedf8ce1fc789e7f947ca46ec20090876e0659e
Author: Haonan <[email protected]>
AuthorDate: Tue May 10 22:05:41 2022 +0800
[IOTDB-3138] Remove old cluster module from distribution package (#5853)
---
.github/workflows/main-unix.yml | 3 +-
.github/workflows/main-win.yml | 3 +-
.github/workflows/sonar-coveralls.yml | 2 +-
distribution/pom.xml | 16 +++++------
distribution/src/assembly/all.xml | 12 ++++----
testcontainer/pom.xml | 52 +++++++++++++++++------------------
6 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/main-unix.yml b/.github/workflows/main-unix.yml
index b18190297e..02eb05329b 100644
--- a/.github/workflows/main-unix.yml
+++ b/.github/workflows/main-unix.yml
@@ -55,4 +55,5 @@ jobs:
- name: IT/UT Test
shell: bash
# we do not compile client-cpp for saving time, it is tested in
client.yml
- run: mvn -B clean verify -Dtest.port.closed=true -P '!testcontainer'
+ # old cluster is deprecated, skip the test
+ run: mvn -B clean verify -Dtest.port.closed=true
-Dcluster.skip.test=true -P '!testcontainer'
diff --git a/.github/workflows/main-win.yml b/.github/workflows/main-win.yml
index ff2a7de860..43423047fc 100644
--- a/.github/workflows/main-win.yml
+++ b/.github/workflows/main-win.yml
@@ -44,8 +44,7 @@ jobs:
# -pl cluster -am -DskipTests=true -Dcluster.test.only=true
# but we just add labels here to make the action name more graceful
it_task: [ 'others',
- 'server',
- 'cluster'
+ 'server'
]
runs-on: windows-latest
diff --git a/.github/workflows/sonar-coveralls.yml
b/.github/workflows/sonar-coveralls.yml
index 443117df46..f5633aba2c 100644
--- a/.github/workflows/sonar-coveralls.yml
+++ b/.github/workflows/sonar-coveralls.yml
@@ -48,7 +48,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2-
- name: IT/UT Test
# we do not compile client-cpp for saving time, it is tested in
client.yml
- run: mvn -B clean compile post-integration-test
-Dtest.port.closed=true -Pcode-coverage -P '!testcontainer,!influxdb-protocol'
+ run: mvn -B clean compile post-integration-test
-Dcluster.skip.test=true -Dtest.port.closed=true -Pcode-coverage -P
'!testcontainer,!influxdb-protocol'
- name: Code Coverage (Coveralls)
if: ${{ success() }}
run: |
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 1eccf37b10..041d1d0c65 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -48,7 +48,7 @@
<descriptors>
<descriptor>src/assembly/all.xml</descriptor>
<descriptor>src/assembly/server.xml</descriptor>
-
<descriptor>src/assembly/cluster.xml</descriptor>
+
<!--descriptor>src/assembly/cluster.xml</descriptor-->
<descriptor>src/assembly/cli.xml</descriptor>
<descriptor>src/assembly/grafana-connector.xml</descriptor>
<descriptor>src/assembly/client-cpp.xml</descriptor>
@@ -85,7 +85,7 @@
<include>apache-iotdb-${project.version}-all-bin.zip</include>
<include>apache-iotdb-${project.version}-server-bin.zip</include>
<include>apache-iotdb-${project.version}-cli-bin.zip</include>
-
<include>apache-iotdb-${project.version}-cluster-bin.zip</include>
+
<!--include>apache-iotdb-${project.version}-cluster-bin.zip</include-->
<include>apache-iotdb-${project.version}-grafana-connector-bin.zip</include>
<include>apache-iotdb-${project.version}-client-cpp-${os.classifier}-bin.zip</include>
<include>apache-iotdb-${project.version}-grafana-plugin-bin.zip</include>
@@ -123,12 +123,12 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>iotdb-cluster</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>org.apache.iotdb</groupId>-->
+ <!-- <artifactId>iotdb-cluster</artifactId>-->
+ <!-- <version>${project.version}</version>-->
+ <!-- <type>zip</type>-->
+ <!-- </dependency>-->
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>client-cpp</artifactId>
diff --git a/distribution/src/assembly/all.xml
b/distribution/src/assembly/all.xml
index dcd04e93ad..76d9d259c3 100644
--- a/distribution/src/assembly/all.xml
+++ b/distribution/src/assembly/all.xml
@@ -31,7 +31,7 @@
<includes>
<include>*:iotdb-server:zip:*</include>
<include>*:iotdb-cli:zip:*</include>
- <include>*:iotdb-cluster:zip:*</include>
+ <!-- <include>*:iotdb-cluster:zip:*</include>-->
</includes>
<outputDirectory>${file.separator}</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
@@ -83,11 +83,11 @@
<!-- <outputDirectory>conf</outputDirectory>-->
<!--
<directory>${maven.multiModuleProjectDirectory}/cluster/src/assembly/resources/conf</directory>-->
<!-- </fileSet>-->
- <fileSet>
- <outputDirectory>sbin</outputDirectory>
-
<directory>${maven.multiModuleProjectDirectory}/cluster/src/assembly/resources/sbin</directory>
- <fileMode>0755</fileMode>
- </fileSet>
+ <!-- <fileSet>-->
+ <!-- <outputDirectory>sbin</outputDirectory>-->
+ <!--
<directory>${maven.multiModuleProjectDirectory}/cluster/src/assembly/resources/sbin</directory>-->
+ <!-- <fileMode>0755</fileMode>-->
+ <!-- </fileSet>-->
<fileSet>
<directory>${maven.multiModuleProjectDirectory}/docs</directory>
<outputDirectory>docs</outputDirectory>
diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml
index 8bb032df4c..e3067d56ab 100644
--- a/testcontainer/pom.xml
+++ b/testcontainer/pom.xml
@@ -33,8 +33,8 @@
<docker.build.executable>docker</docker.build.executable>
<docker.build.single.argument>build -t apache/iotdb:maven-development
-f ${basedir}/../docker/src/main/Dockerfile-single
${basedir}/../.</docker.build.single.argument>
<docker.clean.single.argument>image rm
apache/iotdb:maven-development</docker.clean.single.argument>
- <docker.build.cluster.argument>build -t
apache/iotdb:cluster-maven-development -f
${basedir}/../docker/src/main/Dockerfile-cluster
${basedir}/../.</docker.build.cluster.argument>
- <docker.clean.cluster.argument>image rm
apache/iotdb:cluster-maven-development</docker.clean.cluster.argument>
+<!-- <docker.build.cluster.argument>build -t
apache/iotdb:cluster-maven-development -f
${basedir}/../docker/src/main/Dockerfile-cluster
${basedir}/../.</docker.build.cluster.argument>-->
+<!-- <docker.clean.cluster.argument>image rm
apache/iotdb:cluster-maven-development</docker.clean.cluster.argument>-->
<docker.build.sync.argument>build -t
apache/iotdb:sync-maven-development -f
${basedir}/../docker/src/main/Dockerfile-single-tc
${basedir}/../.</docker.build.sync.argument>
<docker.clean.sync.argument>image rm
apache/iotdb:sync-maven-development</docker.clean.sync.argument>
</properties>
@@ -90,18 +90,18 @@
<commandlineArgs>${docker.build.single.argument}</commandlineArgs>
</configuration>
</execution>
- <execution>
- <id>build-cluster-docker-image</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <skip>${docker.test.skip}</skip>
-
<executable>${docker.build.executable}</executable>
-
<commandlineArgs>${docker.build.cluster.argument}</commandlineArgs>
- </configuration>
- </execution>
+<!-- <execution>-->
+<!-- <id>build-cluster-docker-image</id>-->
+<!-- <phase>pre-integration-test</phase>-->
+<!-- <goals>-->
+<!-- <goal>exec</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <skip>${docker.test.skip}</skip>-->
+<!--
<executable>${docker.build.executable}</executable>-->
+<!--
<commandlineArgs>${docker.build.cluster.argument}</commandlineArgs>-->
+<!-- </configuration>-->
+<!-- </execution>-->
<execution>
<id>build-sync-docker-image</id>
<phase>pre-integration-test</phase>
@@ -126,18 +126,18 @@
<commandlineArgs>${docker.clean.single.argument}</commandlineArgs>
</configuration>
</execution>
- <execution>
- <id>clean-cluster-docker-image</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <skip>${docker.test.skip}</skip>
-
<executable>${docker.build.executable}</executable>
-
<commandlineArgs>${docker.clean.cluster.argument}</commandlineArgs>
- </configuration>
- </execution>
+<!-- <execution>-->
+<!-- <id>clean-cluster-docker-image</id>-->
+<!-- <phase>post-integration-test</phase>-->
+<!-- <goals>-->
+<!-- <goal>exec</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <skip>${docker.test.skip}</skip>-->
+<!--
<executable>${docker.build.executable}</executable>-->
+<!--
<commandlineArgs>${docker.clean.cluster.argument}</commandlineArgs>-->
+<!-- </configuration>-->
+<!-- </execution>-->
<execution>
<id>clean-sync-docker-image</id>
<phase>post-integration-test</phase>
