You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2022/12/18 11:00:33 UTC
[iotdb] branch jenkins-disable-integration updated (da8ef3f18b -> 4ba008d8b4)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch jenkins-disable-integration
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from da8ef3f18b disable integration in jenkins
new 22c817b627 disable integration in jenkins
add 510cce881c add instruction about how to allow large java file generated by Thrift in IDEA (#8490)
add 939630c227 Fix grafana plugin CI (#8497)
add d404c41795 [IOTDB-5121] Update registerUDF.sh and regsiterUDF.bat of library-udf (#8498)
add 86919fb9f9 [IOTDB-5054] Fix errors in IoTDBPipeIT (#8438)
new ae1ffa0af6 Merge remote-tracking branch 'origin/master' into jenkins-disable-integration
new 4ba008d8b4 disable integration in jenkins
The 3 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.
Summary of changes:
Jenkinsfile | 33 ++++++----------------
docs/Development/ContributeGuide.md | 14 ++++++++-
grafana-plugin/backend-compile.sh | 4 +--
integration-test/import-control.xml | 1 +
integration-test/pom.xml | 5 ++++
.../org/apache/iotdb/db/it/sync/IoTDBPipeIT.java | 14 +++++++++
library-udf/src/assembly/tools/register-UDF.bat | 1 -
library-udf/src/assembly/tools/register-UDF.sh | 1 -
8 files changed, 43 insertions(+), 30 deletions(-)
mode change 100644 => 100755 library-udf/src/assembly/tools/register-UDF.sh
[iotdb] 03/03: disable integration in jenkins
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch jenkins-disable-integration
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4ba008d8b4127dada756da0b09e7dde8d1da2fa1
Author: xiangdong huang <hx...@timecho.com>
AuthorDate: Sun Dec 18 19:00:22 2022 +0800
disable integration in jenkins
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 174639063d..94c337d50b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,7 @@ pipeline {
}
steps {
echo 'Building and Unit Test...'
- sh "mvn -T 1C ${MVN_TEST_FAIL_IGNORE} clean install -pl '!integration-test'"
+ sh "mvn -T 1C ${MVN_TEST_FAIL_IGNORE} clean install -pl '!integration-test' -DskipITs"
}
post {
always {
[iotdb] 01/03: disable integration in jenkins
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch jenkins-disable-integration
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 22c817b627198f70172f731d8d9fadd15928e245
Author: xiangdong huang <hx...@timecho.com>
AuthorDate: Sat Dec 17 21:56:00 2022 +0800
disable integration in jenkins
---
Jenkinsfile | 33 ++++++++-------------------------
1 file changed, 8 insertions(+), 25 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ba0c56529d..174639063d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,7 @@ pipeline {
}
steps {
echo 'Building and Unit Test...'
- sh "mvn ${MVN_TEST_FAIL_IGNORE} clean install -pl '!integration-test'"
+ sh "mvn -T 1C ${MVN_TEST_FAIL_IGNORE} clean install -pl '!integration-test'"
}
post {
always {
@@ -105,7 +105,7 @@ pipeline {
}
steps {
echo 'Integration Test...'
- sh "mvn ${MVN_TEST_FAIL_IGNORE} verify -P ClusterIT -pl integration-test -am -DskipUTs -DintegrationTest.threadCount=3 -DintegrationTest.forkCount=3"
+ sh "mvn ${MVN_TEST_FAIL_IGNORE} verify -P ClusterIT -pl integration-test -am -DskipUTs -DintegrationTest.threadCount=5 -DintegrationTest.forkCount=5"
}
post {
always {
@@ -115,37 +115,20 @@ pipeline {
}
}
-// stage('Build') {
-// when {
-// branch 'master'
-// }
-// steps {
-// echo 'Building'
-// sh 'mvn clean'
-// // We'll deploy to a relative directory so we can
-// // deploy new versions only if the entire build succeeds
-// sh "mvn ${MVN_TEST_FAIL_IGNORE} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy -P get-jar-with-dependencies -P ClusterIT -pl '!integration'"
-// }
-// post {
-// always {
-// junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
-// junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
-// }
-// }
-// }
-
- stage('Build') {
+ stage('Deploy Prepare') {
+ // when {
+ // branch 'master'
+ // }
when {
expression {
- env.BRANCH_NAME ==~ "(master)|(rel/.*) |(jenkins-.*)"
+ env.BRANCH_NAME ==~ "(master)|(rel/.*)"
}
}
steps {
echo 'Deploy Prepare'
- sh 'mvn clean'
// We'll deploy to a relative directory so we can
// deploy new versions only if the entire build succeeds
- sh "mvn ${MVN_TEST_FAIL_IGNORE} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy -P get-jar-with-dependencies -DskipTests"
+ sh "mvn -T 1C -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy -DskipTests"
}
post {
always {
[iotdb] 02/03: Merge remote-tracking branch 'origin/master' into jenkins-disable-integration
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch jenkins-disable-integration
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ae1ffa0af6106efe052a2a177dc1a1e85d8d4344
Merge: 22c817b627 86919fb9f9
Author: xiangdong huang <hx...@timecho.com>
AuthorDate: Sun Dec 18 12:24:09 2022 +0800
Merge remote-tracking branch 'origin/master' into jenkins-disable-integration
docs/Development/ContributeGuide.md | 14 +++++++++++++-
grafana-plugin/backend-compile.sh | 4 ++--
integration-test/import-control.xml | 1 +
integration-test/pom.xml | 5 +++++
.../test/java/org/apache/iotdb/db/it/sync/IoTDBPipeIT.java | 14 ++++++++++++++
library-udf/src/assembly/tools/register-UDF.bat | 1 -
library-udf/src/assembly/tools/register-UDF.sh | 1 -
7 files changed, 35 insertions(+), 5 deletions(-)