Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
26362113
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看板
提交
26362113
编写于
5月 06, 2022
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '3.0' of
https://github.com/taosdata/TDengine
into feature/vnode_refact1
上级
d15d011c
b99f18e6
变更
4
展开全部
显示空白变更内容
内联
并排
Showing
4 changed file
with
832 addition
and
112 deletion
+832
-112
Jenkinsfile2
Jenkinsfile2
+171
-104
tests/system-test/2-query/log.py
tests/system-test/2-query/log.py
+7
-7
tests/system-test/2-query/pow.py
tests/system-test/2-query/pow.py
+652
-0
tests/system-test/fulltest.sh
tests/system-test/fulltest.sh
+2
-1
未找到文件。
Jenkinsfile2
浏览文件 @
26362113
...
...
@@ -33,7 +33,7 @@ def abort_previous(){
milestone(buildNumber)
}
def pre_test(){
sh'hostname'
sh
'hostname'
sh '''
date
sudo rmtaos || echo "taosd has not installed"
...
...
@@ -50,35 +50,32 @@ def pre_test(){
cd ${WKC}
git checkout master
'''
}
else if(env.CHANGE_TARGET == '2.0'){
} else if(env.CHANGE_TARGET == '2.0') {
sh '''
cd ${WKC}
git checkout 2.0
'''
}
else if(env.CHANGE_TARGET == '3.0'){
} else if(env.CHANGE_TARGET == '3.0') {
sh '''
cd ${WKC}
git checkout 3.0
[ -d contrib/bdb ]
&&
cd contrib/bdb
&&
git clean -fxd
&&
cd ../..
'''
}
else{
} else {
sh '''
cd ${WKC}
git checkout develop
'''
}
}
sh'''
sh
'''
cd ${WKC}
git pull >/dev/null
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
git submodule update --init --recursive
'''
sh'''
sh
'''
cd ${WKC}
export TZ=Asia/Harbin
date
...
...
@@ -88,7 +85,7 @@ def pre_test(){
cmake .. > /dev/null
make -j4> /dev/null
'''
sh'''
sh
'''
cd ${WKPY}
git reset --hard
git pull
...
...
@@ -96,6 +93,69 @@ def pre_test(){
'''
return 1
}
def pre_test_win(){
bat '''
hostname
date /t
time /t
taskkill /f /t /im python.exe
taskkill /f /t /im bash.exe
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
rd /s /Q C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine\\debug
exit 0
'''
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
git reset --hard
git fetch || git fetch
git checkout -f
'''
script {
if (env.CHANGE_TARGET == 'master') {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
git checkout master
'''
} else if(env.CHANGE_TARGET == '2.0') {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
git checkout 2.0
'''
} else if(env.CHANGE_TARGET == '3.0') {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
git checkout 3.0
'''
} else {
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
git checkout develop
'''
}
}
bat '''
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
git branch
git pull || git pull
git fetch origin +refs/pull/%CHANGE_ID%/merge
git checkout -qf FETCH_HEAD
'''
}
def pre_test_build_win() {
bat '''
echo "building ..."
time /t
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDengine
mkdir debug
cd debug
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
set CL=/MP8
cmake .. -G "NMake Makefiles JOM"
jom -j 4 || exit 8
time /t
'''
return 1
}
pipeline {
agent none
...
...
@@ -106,29 +166,34 @@ pipeline {
WKPY= '/var/lib/jenkins/workspace/taos-connector-python'
}
stages {
stage('pre_build'){
stage('run test') {
parallel {
stage('windows test') {
agent {label " windows11 "}
steps {
pre_test_win()
pre_test_build_win()
}
}
stage('linux test') {
agent{label " slave3_0 || slave15 || slave16 || slave17 "}
options { skipDefaultCheckout() }
when {
changeRequest()
}
steps {
script{
abort_previous()
abortPreviousBuilds()
}
timeout(time: 45, unit: 'MINUTES'){
pre_test()
sh
'''
sh
'''
cd ${WKC}/debug
ctest -VV
'''
sh
'''
sh
'''
export LD_LIBRARY_PATH=${WKC}/debug/build/lib
cd ${WKC}/tests/system-test
./fulltest.sh
'''
sh
'''
sh
'''
cd ${WKC}/tests
./test-all.sh b1fq
'''
...
...
@@ -136,6 +201,8 @@ pipeline {
}
}
}
}
}
post {
success {
emailext (
...
...
tests/system-test/2-query/log.py
浏览文件 @
26362113
...
...
@@ -191,13 +191,13 @@ class TDTestCase:
def
support_types
(
self
):
type_error_sql_lists
=
[
"select log(ts ,2 ) from t1"
,
"select log(c7,2 ) from t1"
,
"select log(c8,
2
) from t1"
,
"select log(c9,2 ) from t1"
,
"select log(ts,
2
) from ct1"
,
"select log(c7,
2
) from ct1"
,
"select log(c8,2 ) from ct1"
,
"select log(c9,
2
) from ct1"
,
"select log(c7,
c
2 ) from t1"
,
"select log(c8,
c1
) from t1"
,
"select log(c9,
c
2 ) from t1"
,
"select log(ts,
c7
) from ct1"
,
"select log(c7,
c9
) from ct1"
,
"select log(c8,
c
2 ) from ct1"
,
"select log(c9,
c1
) from ct1"
,
"select log(ts,2 ) from ct3"
,
"select log(c7,2 ) from ct3"
,
"select log(c8,2 ) from ct3"
,
...
...
tests/system-test/2-query/pow.py
0 → 100644
浏览文件 @
26362113
此差异已折叠。
点击以展开。
tests/system-test/fulltest.sh
浏览文件 @
26362113
...
...
@@ -23,3 +23,4 @@ python3 ./test.py -f 2-query/ceil.py
python3 ./test.py
-f
2-query/floor.py
python3 ./test.py
-f
2-query/round.py
python3 ./test.py
-f
2-query/log.py
python3 ./test.py
-f
2-query/pow.py
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录