From cc1582e6ef0ecaa5d8887166d77a202a58b05679 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Tue, 31 May 2022 16:33:46 +0800 Subject: [PATCH 01/15] add windows ctest to ci --- Jenkinsfile2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index a2b55e3acc..2bfcd15257 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -248,6 +248,15 @@ def pre_test_build_win() { ''' return 1 } +def run_win_test() { + bat ''' + echo "windows ctest ..." + time /t + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug + ctest -j 6 || exit 7 + time /t + ''' +} pipeline { agent none @@ -266,6 +275,7 @@ pipeline { steps { pre_test_win() pre_test_build_win() + run_win_test() } } stage('linux test') { From 64879c45e2cf428b61dce4234e3301196ef9f519 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 1 Jun 2022 14:54:31 +0800 Subject: [PATCH 02/15] enh: windows python test init --- Jenkinsfile2 | 89 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 67 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 2bfcd15257..8b87e50647 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -4,8 +4,8 @@ import jenkins.model.CauseOfInterruption node { } -def skipbuild=0 -def win_stop=0 +win_test_stage = 0 +linux_ready = 0 def abortPreviousBuilds() { def currentJobName = env.JOB_NAME @@ -248,7 +248,7 @@ def pre_test_build_win() { ''' return 1 } -def run_win_test() { +def run_win_ctest() { bat ''' echo "windows ctest ..." time /t @@ -257,6 +257,15 @@ def run_win_test() { time /t ''' } +def run_win_test() { + bat ''' + echo "windows test ..." + time /t + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test + echo "testing ..." + time /t + ''' +} pipeline { agent none @@ -273,9 +282,20 @@ pipeline { stage('windows test') { agent{label " windows10_01 || windows10_02 || windows10_03 || windows10_04 "} steps { - pre_test_win() - pre_test_build_win() - run_win_test() + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 40, unit: 'MINUTES'){ + pre_test_win() + pre_test_build_win() + run_win_ctest() + while(linux_ready == 0) { + sleep(8) + } + run_win_test() + } + } + script { + win_test_stage = 1 + } } } stage('linux test') { @@ -285,22 +305,47 @@ pipeline { changeRequest() } steps { - timeout(time: 40, unit: 'MINUTES'){ - pre_test() - script { - sh ''' - cd ${WKC}/tests/parallel_test - date - time ./container_build.sh -w ${WKDIR} -t 8 -e - rm -f /tmp/cases.task - ./collect_cases.sh -e - ''' - sh ''' - cd ${WKC}/tests/parallel_test - export DEFAULT_RETRY_TIME=2 - date - timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480 - ''' + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 40, unit: 'MINUTES'){ + pre_test() + script { + sh ''' + cd ${WKC}/tests/parallel_test + date + time ./container_build.sh -w ${WKDIR} -t 8 -e + rm -f /tmp/cases.task + ./collect_cases.sh -e + ''' + sh ''' + echo "packaging ..." + date + cd ${WKC}/packaging + ./release.sh -v cluster -n 3.0.0.100 -s static + cd ${WKC}/release + tar xzf TDengine-enterprise-server-3.0.0.100-Linux-x64.tar.gz + cd TDengine-enterprise-server + service taosd stop || : + rm -rf /var/lib/taos + ./install.sh -e no + service taosd start + sleep 20 + service taosd status + ''' + script { + linux_ready = 1 + } + sh ''' + cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 + date + timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480 + ''' + script { + while(win_test_stage == 0){ + sleep(12) + } + } + } } } } From 4adfb46672485da5adc77c4fa080e7833fd8f411 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 1 Jun 2022 15:02:21 +0800 Subject: [PATCH 03/15] fix: Jenkins syntax error --- Jenkinsfile2 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 8b87e50647..923db6e7c0 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -287,8 +287,10 @@ pipeline { pre_test_win() pre_test_build_win() run_win_ctest() - while(linux_ready == 0) { - sleep(8) + script { + while(linux_ready == 0) { + sleep(8) + } } run_win_test() } @@ -331,19 +333,15 @@ pipeline { sleep 20 service taosd status ''' - script { - linux_ready = 1 - } + linux_ready = 1 sh ''' cd ${WKC}/tests/parallel_test export DEFAULT_RETRY_TIME=2 date timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480 ''' - script { - while(win_test_stage == 0){ - sleep(12) - } + while(win_test_stage == 0){ + sleep(12) } } } From df1bed48aae4b21e02c944aad9bc3954cfe299f2 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 1 Jun 2022 15:12:22 +0800 Subject: [PATCH 04/15] fix: dead lock in case of some test failure --- Jenkinsfile2 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 923db6e7c0..82bf6f3a76 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -333,19 +333,29 @@ pipeline { sleep 20 service taosd status ''' - linux_ready = 1 + } + } + } + script { + linux_ready = 1 + } + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 40, unit: 'MINUTES'){ + script { sh ''' cd ${WKC}/tests/parallel_test export DEFAULT_RETRY_TIME=2 date timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480 ''' - while(win_test_stage == 0){ - sleep(12) - } } } } + script { + while(win_test_stage == 0){ + sleep(12) + } + } } } } From 206363c274e2ad0aee5a0e723f0e3261be645b29 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 1 Jun 2022 15:50:14 +0800 Subject: [PATCH 05/15] fix: change build order --- Jenkinsfile2 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 82bf6f3a76..664b336cfb 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -283,7 +283,7 @@ pipeline { agent{label " windows10_01 || windows10_02 || windows10_03 || windows10_04 "} steps { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 40, unit: 'MINUTES'){ + timeout(time: 55, unit: 'MINUTES'){ pre_test_win() pre_test_build_win() run_win_ctest() @@ -308,16 +308,9 @@ pipeline { } steps { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 40, unit: 'MINUTES'){ + timeout(time: 15, unit: 'MINUTES'){ pre_test() script { - sh ''' - cd ${WKC}/tests/parallel_test - date - time ./container_build.sh -w ${WKDIR} -t 8 -e - rm -f /tmp/cases.task - ./collect_cases.sh -e - ''' sh ''' echo "packaging ..." date @@ -325,7 +318,7 @@ pipeline { ./release.sh -v cluster -n 3.0.0.100 -s static cd ${WKC}/release tar xzf TDengine-enterprise-server-3.0.0.100-Linux-x64.tar.gz - cd TDengine-enterprise-server + cd TDengine-enterprise-server-3.0.0.100 service taosd stop || : rm -rf /var/lib/taos ./install.sh -e no @@ -333,6 +326,13 @@ pipeline { sleep 20 service taosd status ''' + sh ''' + cd ${WKC}/tests/parallel_test + date + time ./container_build.sh -w ${WKDIR} -t 8 -e + rm -f /tmp/cases.task + ./collect_cases.sh -e + ''' } } } From 7adc0ecaea589f5b7bb2edd977d6a5249ab3a5e8 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 1 Jun 2022 16:44:29 +0800 Subject: [PATCH 06/15] enh: install python connector for ci windows test --- Jenkinsfile2 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 664b336cfb..6c5e166af2 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -227,6 +227,16 @@ def pre_test_win(){ cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git submodule update --init --recursive ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python + git branch + git reset --hard + git pull + ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python + git log -5 + ''' } def pre_test_build_win() { bat ''' @@ -246,6 +256,10 @@ def pre_test_build_win() { jom -j 6 || exit 8 time /t ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python + python -m pip install . + ''' return 1 } def run_win_ctest() { @@ -325,6 +339,7 @@ pipeline { service taosd start sleep 20 service taosd status + rm -rf ${WKC}/debug ''' sh ''' cd ${WKC}/tests/parallel_test From 4344e5499ca4902f6d8e75588c2eb0b99e7b5ae8 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Thu, 2 Jun 2022 08:58:20 +0800 Subject: [PATCH 07/15] enh: call windows test script in ci --- Jenkinsfile2 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 6c5e166af2..47afe43a89 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -6,6 +6,8 @@ node { win_test_stage = 0 linux_ready = 0 +linux_node_ip = "" +linux_node_pass = "" def abortPreviousBuilds() { def currentJobName = env.JOB_NAME @@ -272,11 +274,13 @@ def run_win_ctest() { ''' } def run_win_test() { + echo "LINUX NODE: ${linux_node_ip} - ${linux_node_pass}" bat ''' echo "windows test ..." time /t cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test echo "testing ..." + test-all.bat "{\"host\":\"''' + linux_node_ip + '''\",\"port\":22,\"user\":\"root\",\"password\":\"''' + linux_node_pass + '''\",\"path\":\"/var/lib/jenkins/workspace/TDinternal\"}" time /t ''' } @@ -321,6 +325,16 @@ pipeline { changeRequest() } steps { + script { + linux_node_ip = sh ( + script: 'jq .ip /home/node_info.json | sed "s/\"//g"', + returnStdout: true + ).trim() + linux_node_pass = sh ( + script: 'jq .password /home/node_info.json | sed "s/\"//g"', + returnStdout: true + ).trim() + } catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 15, unit: 'MINUTES'){ pre_test() @@ -328,6 +342,7 @@ pipeline { sh ''' echo "packaging ..." date + rm -rf ${WKC}/release/* cd ${WKC}/packaging ./release.sh -v cluster -n 3.0.0.100 -s static cd ${WKC}/release From 362db1d0c178c8881b0d18455d08f84776df7631 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Thu, 2 Jun 2022 09:14:01 +0800 Subject: [PATCH 08/15] fix: add escape character to fix syntax error --- Jenkinsfile2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 47afe43a89..1226462570 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -327,11 +327,11 @@ pipeline { steps { script { linux_node_ip = sh ( - script: 'jq .ip /home/node_info.json | sed "s/\"//g"', + script: 'jq .ip /home/node_info.json | sed "s/\\\"//g"', returnStdout: true ).trim() linux_node_pass = sh ( - script: 'jq .password /home/node_info.json | sed "s/\"//g"', + script: 'jq .password /home/node_info.json | sed "s/\\\"//g"', returnStdout: true ).trim() } From 53f53fe9c9275b36f1ef60bd6f5bd568bebb83cb Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Thu, 2 Jun 2022 13:55:14 +0800 Subject: [PATCH 09/15] fix: copy taos.dll to system32 --- Jenkinsfile2 | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 1226462570..d272eb9de7 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -261,6 +261,7 @@ def pre_test_build_win() { bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python python -m pip install . + xcopy /e/y/i/f C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 ''' return 1 } @@ -277,6 +278,8 @@ def run_win_test() { echo "LINUX NODE: ${linux_node_ip} - ${linux_node_pass}" bat ''' echo "windows test ..." + cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python + python -m pip install . time /t cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test echo "testing ..." @@ -335,6 +338,25 @@ pipeline { returnStdout: true ).trim() } + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + timeout(time: 40, unit: 'MINUTES'){ + script { + sh ''' + date + rm -rf ${WKC}/debug + time ./container_build.sh -w ${WKDIR} -t 8 -e + rm -f /tmp/cases.task + ./collect_cases.sh -e + ''' + sh ''' + cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 + date + timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480 + ''' + } + } + } catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 15, unit: 'MINUTES'){ pre_test() @@ -354,14 +376,12 @@ pipeline { service taosd start sleep 20 service taosd status - rm -rf ${WKC}/debug + rm -rf ${WK}/debug + mv ${WKC}/debug ${WK}/ ''' sh ''' - cd ${WKC}/tests/parallel_test - date - time ./container_build.sh -w ${WKDIR} -t 8 -e - rm -f /tmp/cases.task - ./collect_cases.sh -e + cd ${WKPY} + pip3 install . ''' } } @@ -369,18 +389,6 @@ pipeline { script { linux_ready = 1 } - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 40, unit: 'MINUTES'){ - script { - sh ''' - cd ${WKC}/tests/parallel_test - export DEFAULT_RETRY_TIME=2 - date - timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480 - ''' - } - } - } script { while(win_test_stage == 0){ sleep(12) From d64c0e4dd011b3cd7ed9b262cb1b84351e257ed4 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Thu, 2 Jun 2022 14:43:05 +0800 Subject: [PATCH 10/15] fix: add escape character to fix syntax error --- Jenkinsfile2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index d272eb9de7..3562a2fe79 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -283,7 +283,7 @@ def run_win_test() { time /t cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test echo "testing ..." - test-all.bat "{\"host\":\"''' + linux_node_ip + '''\",\"port\":22,\"user\":\"root\",\"password\":\"''' + linux_node_pass + '''\",\"path\":\"/var/lib/jenkins/workspace/TDinternal\"}" + test-all.bat "{\\\"host\\\":\\\"''' + linux_node_ip + '''\\\",\\\"port\\\":22,\\\"user\\\":\\\"root\\\",\\\"password\\\":\\\"''' + linux_node_pass + '''\\\",\\\"path\\\":\\\"/var/lib/jenkins/workspace/TDinternal\\\"}" time /t ''' } @@ -337,13 +337,16 @@ pipeline { script: 'jq .password /home/node_info.json | sed "s/\\\"//g"', returnStdout: true ).trim() + echo "${linux_node_ip}:${linux_node_pass}" } catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 40, unit: 'MINUTES'){ + pre_test() script { sh ''' date rm -rf ${WKC}/debug + cd ${WKC}/tests/parallel_test time ./container_build.sh -w ${WKDIR} -t 8 -e rm -f /tmp/cases.task ./collect_cases.sh -e @@ -359,7 +362,6 @@ pipeline { } catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 15, unit: 'MINUTES'){ - pre_test() script { sh ''' echo "packaging ..." From dace8970f6383916f9f57db16904d8d3984b1cd8 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Sat, 4 Jun 2022 09:50:15 +0800 Subject: [PATCH 11/15] fix: handle special character ! --- Jenkinsfile2 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 3562a2fe79..9cb41978c6 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -270,7 +270,7 @@ def run_win_ctest() { echo "windows ctest ..." time /t cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug - ctest -j 6 || exit 7 + ctest -j 1 || exit 7 time /t ''' } @@ -334,7 +334,7 @@ pipeline { returnStdout: true ).trim() linux_node_pass = sh ( - script: 'jq .password /home/node_info.json | sed "s/\\\"//g"', + script: 'jq .password /home/node_info.json | sed "s/\\\"//g" |sed "s/\\\!/^^^^\\\!/g"', returnStdout: true ).trim() echo "${linux_node_ip}:${linux_node_pass}" @@ -369,19 +369,25 @@ pipeline { rm -rf ${WKC}/release/* cd ${WKC}/packaging ./release.sh -v cluster -n 3.0.0.100 -s static + ''' + sh ''' + echo "install ..." cd ${WKC}/release tar xzf TDengine-enterprise-server-3.0.0.100-Linux-x64.tar.gz cd TDengine-enterprise-server-3.0.0.100 service taosd stop || : rm -rf /var/lib/taos ./install.sh -e no - service taosd start - sleep 20 - service taosd status + ''' + sh ''' + echo "checking ..." + which taos + which taosd rm -rf ${WK}/debug mv ${WKC}/debug ${WK}/ ''' sh ''' + echo "install taospy ..." cd ${WKPY} pip3 install . ''' From 23d9bebaa7eddc7eb9decc90e287619620752077 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Sat, 4 Jun 2022 10:00:42 +0800 Subject: [PATCH 12/15] fix: Jenkins syntax error --- Jenkinsfile2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 9cb41978c6..642a9d74f0 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -334,7 +334,7 @@ pipeline { returnStdout: true ).trim() linux_node_pass = sh ( - script: 'jq .password /home/node_info.json | sed "s/\\\"//g" |sed "s/\\\!/^^^^\\\!/g"', + script: 'jq .password /home/node_info.json | sed "s/\\\"//g" |sed "s/\\!/^^^^\\!/g"', returnStdout: true ).trim() echo "${linux_node_ip}:${linux_node_pass}" From 0af9ab4163e4941bdda8587b1c7dfbe6d613fb08 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Sat, 4 Jun 2022 10:44:50 +0800 Subject: [PATCH 13/15] fix: handle special character ^ --- Jenkinsfile2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 642a9d74f0..a4756a6daa 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -282,6 +282,7 @@ def run_win_test() { python -m pip install . time /t cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test + echo "node: ''' + linux_node_ip + ''':''' + inux_node_pass + '''" echo "testing ..." test-all.bat "{\\\"host\\\":\\\"''' + linux_node_ip + '''\\\",\\\"port\\\":22,\\\"user\\\":\\\"root\\\",\\\"password\\\":\\\"''' + linux_node_pass + '''\\\",\\\"path\\\":\\\"/var/lib/jenkins/workspace/TDinternal\\\"}" time /t @@ -334,7 +335,7 @@ pipeline { returnStdout: true ).trim() linux_node_pass = sh ( - script: 'jq .password /home/node_info.json | sed "s/\\\"//g" |sed "s/\\!/^^^^\\!/g"', + script: 'jq .password /home/node_info.json | sed "s/\\\"//g" |sed "s/\\!/^^^^^^^^\\!/g"', returnStdout: true ).trim() echo "${linux_node_ip}:${linux_node_pass}" From 099de7e94f7e3956cba29400a46b1a823cc264fe Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Sat, 4 Jun 2022 11:12:36 +0800 Subject: [PATCH 14/15] fix: fix a typo --- Jenkinsfile2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index a4756a6daa..25203d37ac 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -282,7 +282,7 @@ def run_win_test() { python -m pip install . time /t cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test - echo "node: ''' + linux_node_ip + ''':''' + inux_node_pass + '''" + echo "node: ''' + linux_node_ip + ''':''' + linux_node_pass + '''" echo "testing ..." test-all.bat "{\\\"host\\\":\\\"''' + linux_node_ip + '''\\\",\\\"port\\\":22,\\\"user\\\":\\\"root\\\",\\\"password\\\":\\\"''' + linux_node_pass + '''\\\",\\\"path\\\":\\\"/var/lib/jenkins/workspace/TDinternal\\\"}" time /t From c1841585107a1dbce0c4a449ce088a503f71d884 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Sat, 4 Jun 2022 12:13:42 +0800 Subject: [PATCH 15/15] fix: copy taos.dll to system dir --- Jenkinsfile2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 25203d37ac..950b316bab 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -280,6 +280,8 @@ def run_win_test() { echo "windows test ..." cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python python -m pip install . + xcopy /e/y/i/f C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 + ls -l C:\\Windows\\System32\\taos.dll time /t cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test echo "node: ''' + linux_node_ip + ''':''' + linux_node_pass + '''"