You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/05/10 07:34:53 UTC
[iotdb] branch remove_old_cluster created (now a580ec604f)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch remove_old_cluster
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at a580ec604f fix
This branch includes the following new commits:
new b61d5e3208 Remove old cluster from distribution
new a580ec604f fix
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 02/02: fix
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch remove_old_cluster
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a580ec604fa17a2e28253c9f26617d790d95a62f
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue May 10 15:34:36 2022 +0800
fix
---
distribution/src/assembly/all.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml
index 2d4b16fd4e..76d9d259c3 100644
--- a/distribution/src/assembly/all.xml
+++ b/distribution/src/assembly/all.xml
@@ -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>
[iotdb] 01/02: Remove old cluster from distribution
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch remove_old_cluster
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b61d5e32087132cf6550282f8af0df462987a593
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue May 10 15:21:47 2022 +0800
Remove old cluster from distribution
---
.github/workflows/main-unix.yml | 3 ++-
.github/workflows/main-win.yml | 3 +--
.github/workflows/sonar-coveralls.yml | 3 ++-
distribution/pom.xml | 16 ++++++++--------
distribution/src/assembly/all.xml | 2 +-
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/main-unix.yml b/.github/workflows/main-unix.yml
index b18190297e..f958cc6329 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 -P '!testcontainer' -Dcluster.skip.test=true
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..77dfc7888a 100644
--- a/.github/workflows/sonar-coveralls.yml
+++ b/.github/workflows/sonar-coveralls.yml
@@ -70,4 +70,5 @@ jobs:
-Dsonar.projectKey=apache_incubator-iotdb \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.login=${{ secrets.SONARCLOUD_TOKEN }} \
- -DskipTests -pl '!distribution' -P '!testcontainer' -am
+ -DskipTests \
+ -Dcluster.skip.test=true -pl '!distribution' -P '!testcontainer' -am
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..2d4b16fd4e 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>