Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
893019d1
T
TDengine
项目概览
taosdata
/
TDengine
接近 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
893019d1
编写于
6月 15, 2022
作者:
T
tangfangzhi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: record git commit id in log file; disable source code backup
上级
aa5efe5c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
12 deletion
+23
-12
Jenkinsfile2
Jenkinsfile2
+11
-0
tests/parallel_test/collect_cases.sh
tests/parallel_test/collect_cases.sh
+9
-9
tests/parallel_test/run.sh
tests/parallel_test/run.sh
+3
-3
未找到文件。
Jenkinsfile2
浏览文件 @
893019d1
...
...
@@ -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
}
...
...
tests/parallel_test/collect_cases.sh
浏览文件 @
893019d1
...
...
@@ -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
tests/parallel_test/run.sh
浏览文件 @
893019d1
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录