From 6b3b56005889c88cf113259dd596370993b3466f Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Tue, 25 Oct 2022 19:20:58 +0800
Subject: [PATCH 1/9] test:add unit tests after building taosd

---
 Jenkinsfile2                           | 5 +++--
 tests/parallel_test/container_build.sh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index ac152e2aa4..33a4b3cce5 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -174,7 +174,8 @@ def pre_test_build_mac() {
     sh '''
         cd ${WK}/debug
         cmake .. -DBUILD_TEST=true
-        make -j8
+        ctest -j10
+        make -j10
     '''
     sh '''
         date
@@ -428,7 +429,7 @@ pipeline {
                                         date
                                         rm -rf ${WKC}/debug
                                         cd ${WKC}/tests/parallel_test
-                                        time ./container_build.sh -w ${WKDIR} -t 8 -e
+                                        time ./container_build.sh -w ${WKDIR} -t 10 -e
                                         rm -f /tmp/cases.task
                                         ./collect_cases.sh -e
                                     '''
diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh
index deaea4fa40..c5866638c4 100755
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
@@ -52,7 +52,7 @@ fi
 
 docker run \
     -v $REP_MOUNT_PARAM \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DWEBSOCKET=true;make -j $THREAD_COUNT"
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true;ctest -j10 ;make -j $THREAD_COUNT"
 
 ret=$?
 exit $ret

From a7010feb574f757e151eca56f5435dec229597b8 Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Tue, 25 Oct 2022 19:45:58 +0800
Subject: [PATCH 2/9] test:add unit tests after building taosd

---
 Jenkinsfile2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 33a4b3cce5..310371adc5 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -174,8 +174,8 @@ def pre_test_build_mac() {
     sh '''
         cd ${WK}/debug
         cmake .. -DBUILD_TEST=true
-        ctest -j10
         make -j10
+        ctest -j10 || exit 7
     '''
     sh '''
         date

From 647633736b8531a56ef39665ea4b250100174589 Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Tue, 25 Oct 2022 19:47:44 +0800
Subject: [PATCH 3/9] test:add unit tests after building taosd

---
 tests/parallel_test/container_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh
index c5866638c4..865b7a0f96 100755
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
@@ -52,7 +52,7 @@ fi
 
 docker run \
     -v $REP_MOUNT_PARAM \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true;ctest -j10 ;make -j $THREAD_COUNT"
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true;make -j $THREAD_COUNT ;ctest -j10 "
 
 ret=$?
 exit $ret

From 83dff5a3b048b548fe26ea3b94ca5d2759d77e5f Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Wed, 26 Oct 2022 17:26:10 +0800
Subject: [PATCH 4/9] test:using single-threaded unit tests on mac os

---
 Jenkinsfile2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 310371adc5..632e4388d0 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -175,7 +175,7 @@ def pre_test_build_mac() {
         cd ${WK}/debug
         cmake .. -DBUILD_TEST=true
         make -j10
-        ctest -j10 || exit 7
+        ctest  || exit 7
     '''
     sh '''
         date

From 2fa0b43376101b50e5aeab9ae55dd9b7c81628be Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Wed, 26 Oct 2022 17:54:07 +0800
Subject: [PATCH 5/9] Update Jenkinsfile2

---
 Jenkinsfile2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 632e4388d0..310371adc5 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -175,7 +175,7 @@ def pre_test_build_mac() {
         cd ${WK}/debug
         cmake .. -DBUILD_TEST=true
         make -j10
-        ctest  || exit 7
+        ctest -j10 || exit 7
     '''
     sh '''
         date

From 5445141599dffaa96833c28a79e927bf420b2fbc Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Wed, 26 Oct 2022 18:37:40 +0800
Subject: [PATCH 6/9] Update Jenkinsfile2

---
 Jenkinsfile2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 310371adc5..91d9403310 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -175,7 +175,6 @@ def pre_test_build_mac() {
         cd ${WK}/debug
         cmake .. -DBUILD_TEST=true
         make -j10
-        ctest -j10 || exit 7
     '''
     sh '''
         date

From f76df96cdc0193efb57e550f2ce8b32c955356c3 Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Thu, 27 Oct 2022 16:01:36 +0800
Subject: [PATCH 7/9] Update Jenkinsfile2

---
 Jenkinsfile2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 91d9403310..2135a89c14 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -173,7 +173,7 @@ def pre_test_build_mac() {
     '''
     sh '''
         cd ${WK}/debug
-        cmake .. -DBUILD_TEST=true
+        cmake .. -DBUILD_TEST=true -DBUILD_HTTPS=false -DBUILD_TOOLS=true -DWEBSOCKET=true 
         make -j10
     '''
     sh '''

From 72ac45cfc5e249918935da772b777071de2aacbc Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Thu, 27 Oct 2022 18:35:04 +0800
Subject: [PATCH 8/9] Update container_build.sh

---
 tests/parallel_test/container_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh
index 865b7a0f96..52864d668f 100755
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
@@ -52,7 +52,7 @@ fi
 
 docker run \
     -v $REP_MOUNT_PARAM \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true;make -j $THREAD_COUNT ;ctest -j10 "
+    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true;make -j $THREAD_COUNT"
 
 ret=$?
 exit $ret

From f4a4d4cf24ecb60682b0277766fee140a00070dc Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Fri, 28 Oct 2022 11:01:16 +0800
Subject: [PATCH 9/9] Update Jenkinsfile2

---
 Jenkinsfile2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 2135a89c14..e25be162e8 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -173,7 +173,7 @@ def pre_test_build_mac() {
     '''
     sh '''
         cd ${WK}/debug
-        cmake .. -DBUILD_TEST=true -DBUILD_HTTPS=false -DBUILD_TOOLS=true -DWEBSOCKET=true 
+        cmake .. -DBUILD_TEST=true -DBUILD_HTTPS=false
         make -j10
     '''
     sh '''