From d40b4f879406c3972c9efe1cb39b7bde63cfbdb2 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Fri, 13 May 2022 22:36:23 +0800 Subject: [PATCH 1/2] enh: set default timeout --- Jenkinsfile2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index f51ddbbac3..ebf3c6aa3a 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -233,7 +233,7 @@ pipeline { changeRequest() } steps { - timeout(time: 20, unit: 'MINUTES'){ + timeout(time: 40, unit: 'MINUTES'){ pre_test() script { sh ''' @@ -245,8 +245,9 @@ pipeline { ''' sh ''' cd ${WKC}/tests/parallel_test + export DEFAULT_RETRY_TIME=2 date - time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME} -l ${WKDIR}/log + timeout 2340 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME} -l ${WKDIR}/log -o 480 ''' } } From cf6dc6e6b3c24f317cce1d6ba8e06f6c666fe6be Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Fri, 13 May 2022 22:52:02 +0800 Subject: [PATCH 2/2] enh: change timeout to 35 minutes --- Jenkinsfile2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index ebf3c6aa3a..cbf663cdcf 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -247,7 +247,7 @@ pipeline { cd ${WKC}/tests/parallel_test export DEFAULT_RETRY_TIME=2 date - timeout 2340 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME} -l ${WKDIR}/log -o 480 + timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME} -l ${WKDIR}/log -o 480 ''' } }