From 5d4aca0926ce5a32d41484d26480634b36986fb5 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 13 Oct 2020 16:25:48 +0800 Subject: [PATCH 1/3] [TD-1676] fix Jenkinsfile error --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c285383c79..d4b07ffd0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,7 @@ pipeline { make > /dev/null cd ${WKC}/tests #./test-all.sh smoke - sh test-all.sh b1 + ./test-all.sh b1 date''' } } @@ -75,10 +75,10 @@ pipeline { cmake .. > /dev/null make > /dev/null cd ${WKC}/tests/pytest - sh crash_gen.sh -a -p -t 4 -s 2000 + ./crash_gen.sh -a -p -t 4 -s 2000 date cd ${WKC}/tests - sh test-all.sh b2 + ./test-all.sh b2 date ''' } @@ -104,7 +104,7 @@ pipeline { cmake .. > /dev/null make > /dev/null cd ${WKC}/tests/pytest - sh start_valgrind.sh 2>&1 > mem-error-out.log + ./start_valgrind.sh 2>&1 > mem-error-out.log grep \'start to execute\\|ERROR SUMMARY\' mem-error-out.log|grep -v \'grep\'|uniq|tee uniq-mem-error-out.log for memError in `grep \'ERROR SUMMARY\' uniq-mem-error-out.log | awk \'{print $4}\'` @@ -130,8 +130,8 @@ pipeline { fi done date - cd ${WORKSPACE}/tests - sh test-all.sh b3 + cd ${WKC}/tests + ./test-all.sh b3 date''' } } From 8f7cac1f0de4d81898f51d57d218a0d9eb78e0d4 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 13 Oct 2020 16:46:46 +0800 Subject: [PATCH 2/3] [TD-1676]fix Jenkinsfile error --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d4b07ffd0b..94eb588379 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,7 +104,7 @@ pipeline { cmake .. > /dev/null make > /dev/null cd ${WKC}/tests/pytest - ./start_valgrind.sh 2>&1 > mem-error-out.log + ./valgrind-test.sh 2>&1 > mem-error-out.log grep \'start to execute\\|ERROR SUMMARY\' mem-error-out.log|grep -v \'grep\'|uniq|tee uniq-mem-error-out.log for memError in `grep \'ERROR SUMMARY\' uniq-mem-error-out.log | awk \'{print $4}\'` From 129cfc2dedc4a29422749277aef8bcc54aa96e9b Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 13 Oct 2020 18:50:14 +0800 Subject: [PATCH 3/3] fix Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 94eb588379..3e6f3d018d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { agent{label "185"} steps { sh ''' - date + cd ${WKC} git checkout develop git pull @@ -68,7 +68,7 @@ pipeline { git checkout develop git pull export TZ=Asia/Harbin - date + rm -rf ${WK}/debug mkdir debug cd debug