From 230bcee1e074cac4b3b60ddf97f03e9168f43a4f Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Sat, 6 Feb 2021 10:36:16 +0800 Subject: [PATCH] fix --- Jenkinsfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ca78e9c89..6b91d61f69 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -160,6 +160,9 @@ pipeline { stage('test_crash_gen_s3') { agent{label "b2"} + options{ + timeout(time: 45, unit: 'MINUTES') + } steps { pre_test() catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { @@ -171,17 +174,16 @@ pipeline { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { sh ''' cd ${WKC}/tests/pytest + rm -rf /var/lib/taos/* ./handle_crash_gen_val_log.sh ''' - } - timeout(time: 45, unit: 'MINUTES'){ - sh ''' - date - cd ${WKC}/tests - ./test-all.sh b2fq - date - ''' - } + } + sh ''' + date + cd ${WKC}/tests + ./test-all.sh b2fq + date + ''' } } @@ -215,6 +217,7 @@ pipeline { date cd ${WKC}/tests ./test-all.sh b4fq + cd ${WKC}/tests ./test-all.sh p4 date''' } -- GitLab