提交 4344e549 编写于 作者: T tangfangzhi

enh: call windows test script in ci

上级 7adc0eca
...@@ -6,6 +6,8 @@ node { ...@@ -6,6 +6,8 @@ node {
win_test_stage = 0 win_test_stage = 0
linux_ready = 0 linux_ready = 0
linux_node_ip = ""
linux_node_pass = ""
def abortPreviousBuilds() { def abortPreviousBuilds() {
def currentJobName = env.JOB_NAME def currentJobName = env.JOB_NAME
...@@ -272,11 +274,13 @@ def run_win_ctest() { ...@@ -272,11 +274,13 @@ def run_win_ctest() {
''' '''
} }
def run_win_test() { def run_win_test() {
echo "LINUX NODE: ${linux_node_ip} - ${linux_node_pass}"
bat ''' bat '''
echo "windows test ..." echo "windows test ..."
time /t time /t
cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test
echo "testing ..." echo "testing ..."
test-all.bat "{\"host\":\"''' + linux_node_ip + '''\",\"port\":22,\"user\":\"root\",\"password\":\"''' + linux_node_pass + '''\",\"path\":\"/var/lib/jenkins/workspace/TDinternal\"}"
time /t time /t
''' '''
} }
...@@ -321,6 +325,16 @@ pipeline { ...@@ -321,6 +325,16 @@ pipeline {
changeRequest() changeRequest()
} }
steps { steps {
script {
linux_node_ip = sh (
script: 'jq .ip /home/node_info.json | sed "s/\"//g"',
returnStdout: true
).trim()
linux_node_pass = sh (
script: 'jq .password /home/node_info.json | sed "s/\"//g"',
returnStdout: true
).trim()
}
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
timeout(time: 15, unit: 'MINUTES'){ timeout(time: 15, unit: 'MINUTES'){
pre_test() pre_test()
...@@ -328,6 +342,7 @@ pipeline { ...@@ -328,6 +342,7 @@ pipeline {
sh ''' sh '''
echo "packaging ..." echo "packaging ..."
date date
rm -rf ${WKC}/release/*
cd ${WKC}/packaging cd ${WKC}/packaging
./release.sh -v cluster -n 3.0.0.100 -s static ./release.sh -v cluster -n 3.0.0.100 -s static
cd ${WKC}/release cd ${WKC}/release
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册