Merge pull request #13803 from taosdata/test/TD-16510

ci: enhancement - backup source code if case fails

Jenkinsfile2

@@ -38,6 +38,7 @@ def pre_test(){
     sh '''
         hostname
         date
+        env
     '''
     sh '''
         cd ${WK}
@@ -82,23 +83,33 @@ def pre_test(){
         sh '''
             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 '''
@@ -113,6 +124,9 @@ def pre_test(){
         cd ${WKPY}
         git reset --hard
         git pull
+        git log -5
+        echo "python connector log: `git log -5`" >>${WKDIR}/jenkins.log
+        echo >>${WKDIR}/jenkins.log
     '''
     return 1
 }

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 --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
 

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 "core.*"`
             echo -e "$case_info \e[31m failed\e[0m"
             echo "=========================log============================"
             cat $log_dir/$case_file.log
@@ -291,6 +290,19 @@ function run_thread() {
             fi
             cmd="$scpcmd:${remote_sim_tar} $log_dir/${case_file}.sim.tar.gz"
             $cmd
+            # backup source code (disabled)
+            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
 }