[iotdb] branch jenkins-disable-integration updated: disable integration in jenkins

[hxd]

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


The following commit(s) were added to refs/heads/jenkins-disable-integration by 
this push:
     new 276173e2da disable integration in jenkins
276173e2da is described below

commit 276173e2da29ef403f88e56f5e0bfe616ff48abb
Author: xiangdong huang <h...@timecho.com>
AuthorDate: Sat Dec 17 20:26:18 2022 +0800

    disable integration in jenkins
---
 Jenkinsfile              | 40 +++++++++++++++++++++++++++++-----------
 integration-test/pom.xml |  3 ++-
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6155f9c0f4..c80b6befc7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,15 +79,15 @@ pipeline {
             }
         }
 
-        stage('Build (not master)') {
+        stage('Build and UT') {
             when {
                 expression {
-                    env.BRANCH_NAME != 'master'
+                    env.BRANCH_NAME ==~ /(master|rel/.*|jenkins-.*)/
                 }
             }
             steps {
-                echo 'Building'
-                sh "mvn ${MVN_TEST_FAIL_IGNORE}  clean install -P ClusterIT 
-pl '!integration'"
+                echo 'Building and Unit Test...'
+                sh "mvn ${MVN_TEST_FAIL_IGNORE} clean install -pl 
'!integration-test'"
             }
             post {
                 always {
@@ -97,16 +97,15 @@ pipeline {
             }
         }
 
-        stage('Build') {
+        stage('Integration Test') {
             when {
-                branch 'master'
+                expression {
+                    env.BRANCH_NAME ==~ /(master|rel/.*|jenkins-.*)/
+                }
             }
             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'"
+                echo 'Integration Test...'
+                sh "mvn ${MVN_TEST_FAIL_IGNORE} verify -P ClusterIT -pl 
integration-test -am -DskipUTs -DintegrationTest.threadCount=2 
-DintegrationTest.forkCount=2"
             }
             post {
                 always {
@@ -116,6 +115,25 @@ 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('Code Quality') {
             when {
                 branch 'master'
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 324f7e8ddd..875a84ba01 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -30,6 +30,7 @@
     <artifactId>integration-test</artifactId>
     <properties>
         <integrationTest.forkCount>1</integrationTest.forkCount>
+        <integrationTest.threadCount>1</integrationTest.threadCount>
         
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
         
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
         
<integrationTest.launchNodeInSameJVM>true</integrationTest.launchNodeInSameJVM>
@@ -167,7 +168,7 @@
                             
<excludedGroups>${integrationTest.excludedGroups}</excludedGroups>
                             <useSystemClassLoader>false</useSystemClassLoader>
                             
<parallel>${integrationTest.parallelMode}</parallel>
-                            <threadCount>1</threadCount>
+                            
<threadCount>${integrationTest.threadCount}</threadCount>
                             <forkCount>${integrationTest.forkCount}</forkCount>
                             <reuseForks>false</reuseForks>
                             <systemPropertyVariables>