diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 82bf6f3a76a3cd0e74e8124c7ada890e8fb785e9..664b336cfb12d60485bdee81126ad00a7007c946 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 + ''' } } }