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 2021/06/10 03:48:55 UTC
[iotdb] branch master updated: [IOTDB-1429]fix failsafe-plugin not
report failures issue (#3374)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 fe983ed [IOTDB-1429]fix failsafe-plugin not report failures issue (#3374)
fe983ed is described below
commit fe983ed81b97aa8b232bbdde57df08f5e9c32b0d
Author: Xiangdong Huang <hx...@apache.org>
AuthorDate: Thu Jun 10 11:48:22 2021 +0800
[IOTDB-1429]fix failsafe-plugin not report failures issue (#3374)
* fix failsafe-plugin not report failures issue
* Fix EnvScriptIT on Windows
Co-authored-by: HTHou <hh...@outlook.com>
---
.github/workflows/e2e.yml | 2 +-
.github/workflows/sonar-coveralls.yml | 4 ++--
cli/pom.xml | 1 +
cluster/pom.xml | 1 +
cross-tests/pom.xml | 1 +
grafana/pom.xml | 1 +
hadoop/pom.xml | 1 +
jdbc/pom.xml | 1 +
pom.xml | 1 +
server/pom.xml | 1 +
server/src/assembly/resources/conf/iotdb-env.bat | 4 ++--
service-rpc/pom.xml | 1 +
session/pom.xml | 1 +
testcontainer/pom.xml | 1 +
tsfile/pom.xml | 1 +
15 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index d0c2c60..d32e302 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -58,4 +58,4 @@ jobs:
- name: TestContainer
run: |
- mvn -B integration-test -pl testcontainer
+ mvn -B -T 4 integration-test -pl testcontainer
diff --git a/.github/workflows/sonar-coveralls.yml b/.github/workflows/sonar-coveralls.yml
index 5a8d1b7..30ec9aa 100644
--- a/.github/workflows/sonar-coveralls.yml
+++ b/.github/workflows/sonar-coveralls.yml
@@ -59,7 +59,7 @@ jobs:
-Dbranch=$BRANCH_NAME \
-DpullRequest=$PR_NUMBER \
-DrepoToken=${{ secrets.COVERALL_TOKEN }} \
- -Pcode-coverage
+ -Pcode-coverage -P '!testcontainer'
- name: SonarCloud Report
if: ${{ success() && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'apache/iotdb' || github.event_name == 'push')}}
env:
@@ -71,4 +71,4 @@ jobs:
-Dsonar.projectKey=apache_incubator-iotdb \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.login=${{ secrets.SONARCLOUD_TOKEN }} \
- -DskipTests -pl '!distribution' -am
+ -DskipTests -pl '!distribution' -P '!testcontainer' -am
diff --git a/cli/pom.xml b/cli/pom.xml
index acb3304..e0bfe82 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -96,6 +96,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/cluster/pom.xml b/cluster/pom.xml
index 2fe5f92..ff950d0 100644
--- a/cluster/pom.xml
+++ b/cluster/pom.xml
@@ -189,6 +189,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/cross-tests/pom.xml b/cross-tests/pom.xml
index a2cf524..e377150 100644
--- a/cross-tests/pom.xml
+++ b/cross-tests/pom.xml
@@ -73,6 +73,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index 5b4362b..d535c50 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -197,6 +197,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index ffd65dd..79e03fc 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -134,6 +134,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 92a0e43..63f60b6 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -159,6 +159,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 17a4056..35e4260 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1413,6 +1413,7 @@
<execution>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/server/pom.xml b/server/pom.xml
index cd2a439..9b57f1b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -224,6 +224,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/server/src/assembly/resources/conf/iotdb-env.bat b/server/src/assembly/resources/conf/iotdb-env.bat
index 5926467..ed5c962 100644
--- a/server/src/assembly/resources/conf/iotdb-env.bat
+++ b/server/src/assembly/resources/conf/iotdb-env.bat
@@ -126,5 +126,5 @@ IF "%1" equ "printgc" (
@REM Maximum heap size
@REM set MAX_HEAP_SIZE=2G
-echo If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat).
-echo Maximum memory allocation pool = %MAX_HEAP_SIZE%, initial memory allocation pool = %HEAP_NEWSIZE%
\ No newline at end of file
+echo Maximum memory allocation pool = %MAX_HEAP_SIZE%, initial memory allocation pool = %HEAP_NEWSIZE%
+echo If you want to change this configuration, please check conf/iotdb-env.sh(Unix or OS X, if you use Windows, check conf/iotdb-env.bat).
\ No newline at end of file
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index 591a9d5..73aa2ce 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -114,6 +114,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/session/pom.xml b/session/pom.xml
index fe0dfc4..b79f4a3 100644
--- a/session/pom.xml
+++ b/session/pom.xml
@@ -54,6 +54,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml
index ecd16b7..e28c51f 100644
--- a/testcontainer/pom.xml
+++ b/testcontainer/pom.xml
@@ -148,6 +148,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 67e3b24..d48a9ac 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -115,6 +115,7 @@
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>