From 63b40fb29c8b0566e5223abffcb75db0f9c064cd Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Tue, 14 Jun 2022 14:03:51 +0800 Subject: [PATCH 1/8] enh: backup source code if case fails --- tests/parallel_test/collect_cases.sh | 11 +++++++++++ tests/parallel_test/run.sh | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/tests/parallel_test/collect_cases.sh b/tests/parallel_test/collect_cases.sh index c560598c81..8ae83f5618 100755 --- a/tests/parallel_test/collect_cases.sh +++ b/tests/parallel_test/collect_cases.sh @@ -41,5 +41,16 @@ fi cat ../script/jenkins/basic.txt |grep -v "^#"|grep -v "^$"|sed "s/^/,,script,/" >>$case_file grep "^python" ../system-test/fulltest.sh |sed "s/^/,,system-test,/" >>$case_file +# tar source code for run.sh to use +if [ $ent -eq 0 ]; then + cd ../../../ + rm -rf TDengine.tar.gz + tar czf TDengine.tar.gz TDengine taos-connector-python --exclude=TDengine/debug +else + cd ../../../../ + rm -rf TDinternal.tar.gz + tar czf TDinternal.tar.gz TDinternal taos-connector-python --exclude=TDinternal/debug --exclude=TDinternal/community/debug +fi + exit 0 diff --git a/tests/parallel_test/run.sh b/tests/parallel_test/run.sh index 6417f41fd4..3b0c0da8cd 100755 --- a/tests/parallel_test/run.sh +++ b/tests/parallel_test/run.sh @@ -291,6 +291,19 @@ function run_thread() { fi cmd="$scpcmd:${remote_sim_tar} $log_dir/${case_file}.sim.tar.gz" $cmd + # backup source code + source_tar_dir=$log_dir/TDengine_${hosts[index]} + source_tar_file=TDengine.tar.gz + if [ $ent -ne 0 ]; then + source_tar_dir=$log_dir/TDinternal_${hosts[index]} + source_tar_file=TDinternal.tar.gz + fi + mkdir $source_tar_dir 2>/dev/null + if [ $? -eq 0 ]; then + cmd="$scpcmd:${workdirs[index]}/$source_tar_file $source_tar_dir" + echo "$cmd" + $cmd + fi fi done } From c77e7d521afba79c625ffa0bb25eef51ad8d17a5 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Tue, 14 Jun 2022 15:01:45 +0800 Subject: [PATCH 2/8] enh: exclude some more directories when tar source files --- tests/parallel_test/collect_cases.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/parallel_test/collect_cases.sh b/tests/parallel_test/collect_cases.sh index 8ae83f5618..2c8c61b0b7 100755 --- a/tests/parallel_test/collect_cases.sh +++ b/tests/parallel_test/collect_cases.sh @@ -45,11 +45,11 @@ grep "^python" ../system-test/fulltest.sh |sed "s/^/,,system-test,/" >>$case_fil if [ $ent -eq 0 ]; then cd ../../../ rm -rf TDengine.tar.gz - tar czf TDengine.tar.gz TDengine taos-connector-python --exclude=TDengine/debug + tar --exclude=TDengine/debug --exclude=TDengine/sim --exclude=TDengine/release -czf TDengine.tar.gz TDengine taos-connector-python else cd ../../../../ rm -rf TDinternal.tar.gz - tar czf TDinternal.tar.gz TDinternal taos-connector-python --exclude=TDinternal/debug --exclude=TDinternal/community/debug + tar --exclude=TDinternal/debug --exclude=TDinternal/sim --exclude=TDinternal/community/debug --exclude=TDinternal/community/release -czf TDinternal.tar.gz TDinternal taos-connector-python fi exit 0 From 3c8fcc7c794723509cdf15fb1230ace631810baf Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Tue, 14 Jun 2022 16:00:05 +0800 Subject: [PATCH 3/8] enh: exclude some more directories --- tests/parallel_test/collect_cases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/collect_cases.sh b/tests/parallel_test/collect_cases.sh index 2c8c61b0b7..c12413b981 100755 --- a/tests/parallel_test/collect_cases.sh +++ b/tests/parallel_test/collect_cases.sh @@ -49,7 +49,7 @@ if [ $ent -eq 0 ]; then else cd ../../../../ rm -rf TDinternal.tar.gz - tar --exclude=TDinternal/debug --exclude=TDinternal/sim --exclude=TDinternal/community/debug --exclude=TDinternal/community/release -czf TDinternal.tar.gz TDinternal taos-connector-python + tar --exclude=TDinternal/debug --exclude=TDinternal/sim --exclude=TDinternal/community/debug --exclude=TDinternal/community/release --exclude=TDinternal/community/sim -czf TDinternal.tar.gz TDinternal taos-connector-python fi exit 0 From 3acacf163ac29b648d13470ef6cba749013bea7b Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Tue, 14 Jun 2022 16:32:17 +0800 Subject: [PATCH 4/8] enh: show commit id of target branch --- Jenkinsfile2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 950b316bab..a29169eece 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -82,6 +82,7 @@ def pre_test(){ sh ''' cd ${WKC} git pull >/dev/null + git log -5 git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git log -5 @@ -93,6 +94,7 @@ def pre_test(){ sh ''' cd ${WK} git pull >/dev/null + git log -5 git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git log -5 From aa5efe5cbe43faf47b465d74410132062b45dce0 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Tue, 14 Jun 2022 18:18:59 +0800 Subject: [PATCH 5/8] enh: show commit id of python connector --- Jenkinsfile2 | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index a29169eece..79a7bab0c3 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -115,6 +115,7 @@ def pre_test(){ cd ${WKPY} git reset --hard git pull + git log -5 ''' return 1 } From 893019d1062a96988fdc4d4b5be44ccdcab898d5 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 15 Jun 2022 13:50:13 +0800 Subject: [PATCH 6/8] enh: record git commit id in log file; disable source code backup --- Jenkinsfile2 | 11 +++++++++++ tests/parallel_test/collect_cases.sh | 18 +++++++++--------- tests/parallel_test/run.sh | 6 +++--- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 79a7bab0c3..94af11868a 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -38,6 +38,7 @@ def pre_test(){ sh ''' hostname date + env ''' sh ''' cd ${WK} @@ -83,24 +84,32 @@ def pre_test(){ cd ${WKC} git pull >/dev/null git log -5 + echo "`date "+%Y%m%d-%H%M%S"` ${JOB_NAME}:${BRANCH_NAME}:${BUILD_ID}:${CHANGE_TARGET}" >>${WKDIR}/jenkins.log + echo "community log: `git log -5`" >>${WKDIR}/jenkins.log git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git log -5 + echo "community log merged: `git log -5`" >>${WKDIR}/jenkins.log cd ${WK} git pull >/dev/null git log -5 + echo "tdinternal log: `git log -5`" >>${WKDIR}/jenkins.log ''' } else if (env.CHANGE_URL =~ /\/TDinternal\//) { sh ''' cd ${WK} git pull >/dev/null git log -5 + echo "`date "+%Y%m%d-%H%M%S"` ${JOB_NAME}:${BRANCH_NAME}:${BUILD_ID}:${CHANGE_TARGET}" >>${WKDIR}/jenkins.log + echo "tdinternal log: `git log -5`" >>${WKDIR}/jenkins.log git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git log -5 + echo "tdinternal log merged: `git log -5`" >>${WKDIR}/jenkins.log cd ${WKC} git pull >/dev/null git log -5 + echo "community log: `git log -5`" >>${WKDIR}/jenkins.log ''' } else { sh ''' @@ -116,6 +125,8 @@ def pre_test(){ git reset --hard git pull git log -5 + echo "python connector log: `git log -5`" >>${WKDIR}/jenkins.log + echo >>${WKDIR}/jenkins.log ''' return 1 } diff --git a/tests/parallel_test/collect_cases.sh b/tests/parallel_test/collect_cases.sh index c12413b981..bc942263d0 100755 --- a/tests/parallel_test/collect_cases.sh +++ b/tests/parallel_test/collect_cases.sh @@ -42,15 +42,15 @@ cat ../script/jenkins/basic.txt |grep -v "^#"|grep -v "^$"|sed "s/^/,,script,/" grep "^python" ../system-test/fulltest.sh |sed "s/^/,,system-test,/" >>$case_file # tar source code for run.sh to use -if [ $ent -eq 0 ]; then - cd ../../../ - rm -rf TDengine.tar.gz - tar --exclude=TDengine/debug --exclude=TDengine/sim --exclude=TDengine/release -czf TDengine.tar.gz TDengine taos-connector-python -else - cd ../../../../ - rm -rf TDinternal.tar.gz - tar --exclude=TDinternal/debug --exclude=TDinternal/sim --exclude=TDinternal/community/debug --exclude=TDinternal/community/release --exclude=TDinternal/community/sim -czf TDinternal.tar.gz TDinternal taos-connector-python -fi +# if [ $ent -eq 0 ]; then +# cd ../../../ +# rm -rf TDengine.tar.gz +# tar --exclude=TDengine/debug --exclude=TDengine/sim --exclude=TDengine/release -czf TDengine.tar.gz TDengine taos-connector-python +# else +# cd ../../../../ +# rm -rf TDinternal.tar.gz +# tar --exclude=TDinternal/debug --exclude=TDinternal/sim --exclude=TDinternal/community/debug --exclude=TDinternal/community/release --exclude=TDinternal/community/sim -czf TDinternal.tar.gz TDinternal taos-connector-python +# fi exit 0 diff --git a/tests/parallel_test/run.sh b/tests/parallel_test/run.sh index 3b0c0da8cd..1b54dc338e 100755 --- a/tests/parallel_test/run.sh +++ b/tests/parallel_test/run.sh @@ -291,7 +291,7 @@ function run_thread() { fi cmd="$scpcmd:${remote_sim_tar} $log_dir/${case_file}.sim.tar.gz" $cmd - # backup source code + # backup source code (disabled) source_tar_dir=$log_dir/TDengine_${hosts[index]} source_tar_file=TDengine.tar.gz if [ $ent -ne 0 ]; then @@ -301,8 +301,8 @@ function run_thread() { mkdir $source_tar_dir 2>/dev/null if [ $? -eq 0 ]; then cmd="$scpcmd:${workdirs[index]}/$source_tar_file $source_tar_dir" - echo "$cmd" - $cmd + # echo "$cmd" + # $cmd fi fi done From ac9917a39bcd3dbd560479d09e17cf52754e1795 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 15 Jun 2022 14:26:57 +0800 Subject: [PATCH 7/8] fix: adapt to different coredump configurations --- tests/parallel_test/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/run.sh b/tests/parallel_test/run.sh index 1b54dc338e..f6f09d2823 100755 --- a/tests/parallel_test/run.sh +++ b/tests/parallel_test/run.sh @@ -255,7 +255,7 @@ function run_thread() { $cmd # 2>/dev/null local case_info=`echo "$line"|cut -d, -f 3,4` local corefile=`ls $log_dir/${case_file}.coredump/` - corefile=`find $log_dir/${case_file}.coredump/ -name "core.*"` + corefile=`find $log_dir/${case_file}.coredump/ -name "*"` echo -e "$case_info \e[31m failed\e[0m" echo "=========================log============================" cat $log_dir/$case_file.log From 055d2dd15551fe86c4fbff008d38cc7823a67ece Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 15 Jun 2022 15:06:12 +0800 Subject: [PATCH 8/8] fix: incorrect coredump file check --- tests/parallel_test/run.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/parallel_test/run.sh b/tests/parallel_test/run.sh index f6f09d2823..e9871637bd 100755 --- a/tests/parallel_test/run.sh +++ b/tests/parallel_test/run.sh @@ -255,7 +255,6 @@ function run_thread() { $cmd # 2>/dev/null local case_info=`echo "$line"|cut -d, -f 3,4` local corefile=`ls $log_dir/${case_file}.coredump/` - corefile=`find $log_dir/${case_file}.coredump/ -name "*"` echo -e "$case_info \e[31m failed\e[0m" echo "=========================log============================" cat $log_dir/$case_file.log