提交 4a2438c2 编写于 作者: L liuyq-617

(full)test

上级 d73be1bc
...@@ -55,10 +55,10 @@ def pre_test(){ ...@@ -55,10 +55,10 @@ def pre_test(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
sh ''' sh '''
cd ${WKC} cd ${WKC}
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -87,10 +87,10 @@ def pre_test(){ ...@@ -87,10 +87,10 @@ def pre_test(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
sh ''' sh '''
cd ${WK} cd ${WK}
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -130,10 +130,10 @@ def pre_test_noinstall(){ ...@@ -130,10 +130,10 @@ def pre_test_noinstall(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
sh ''' sh '''
cd ${WKC} cd ${WKC}
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -162,10 +162,10 @@ def pre_test_noinstall(){ ...@@ -162,10 +162,10 @@ def pre_test_noinstall(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
sh ''' sh '''
cd ${WK} cd ${WK}
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -202,10 +202,10 @@ def pre_test_mac(){ ...@@ -202,10 +202,10 @@ def pre_test_mac(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
sh ''' sh '''
cd ${WKC} cd ${WKC}
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -234,10 +234,10 @@ def pre_test_mac(){ ...@@ -234,10 +234,10 @@ def pre_test_mac(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
sh ''' sh '''
cd ${WK} cd ${WK}
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -280,10 +280,10 @@ def pre_test_win(){ ...@@ -280,10 +280,10 @@ def pre_test_win(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
bat ''' bat '''
cd C:\\workspace\\TDinternal\\community cd C:\\workspace\\TDinternal\\community
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -311,10 +311,10 @@ def pre_test_win(){ ...@@ -311,10 +311,10 @@ def pre_test_win(){
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.4'){ else if(env.CHANGE_TARGET == '2.0'){
bat ''' bat '''
cd C:\\workspace\\TDinternal cd C:\\workspace\\TDinternal
git checkout 2.4 git checkout 2.0
''' '''
} }
else{ else{
...@@ -494,32 +494,24 @@ pipeline { ...@@ -494,32 +494,24 @@ pipeline {
steps { steps {
pre_test() pre_test()
timeout(time: 100, unit: 'MINUTES'){ timeout(time: 100, unit: 'MINUTES'){
script{
scope.each {
sh """ sh """
date date
cd ${WKC}/tests cd ${WKC}/tests
./test-CI.sh sim 4 ${sim_mod[0]} ./test-CI.sh sim 4 ${sim_mod[0]}
date""" date"""
} }
} }
}
}
} }
stage('sim_2') { stage('sim_2') {
agent{label " slave7 || slave17 "} agent{label " slave7 || slave17 "}
steps { steps {
pre_test() pre_test()
timeout(time: 100, unit: 'MINUTES'){ timeout(time: 100, unit: 'MINUTES'){
script{ sh """
scope.each { date
sh """ cd ${WKC}/tests
date ./test-CI.sh sim 4 ${sim_mod[1]}
cd ${WKC}/tests date"""
./test-CI.sh sim 4 ${sim_mod[1]}
date"""
}
}
} }
} }
} }
...@@ -528,15 +520,11 @@ pipeline { ...@@ -528,15 +520,11 @@ pipeline {
steps { steps {
timeout(time: 105, unit: 'MINUTES'){ timeout(time: 105, unit: 'MINUTES'){
pre_test() pre_test()
script{ sh """
scope.each { date
sh """ cd ${WKC}/tests
date ./test-CI.sh sim 4 ${sim_mod[2]}
cd ${WKC}/tests date"""
./test-CI.sh sim 4 ${sim_mod[2]}
date"""
}
}
} }
} }
} }
...@@ -545,18 +533,14 @@ pipeline { ...@@ -545,18 +533,14 @@ pipeline {
steps { steps {
timeout(time: 100, unit: 'MINUTES'){ timeout(time: 100, unit: 'MINUTES'){
pre_test() pre_test()
script{ sh """
scope.each { date
sh """ cd ${WKC}/tests
date ./test-CI.sh sim 4 ${sim_mod[3]}
cd ${WKC}/tests date"""
./test-CI.sh sim 4 ${sim_mod[3]}
date"""
}
} }
} }
}
} }
stage('other') { stage('other') {
agent{label " slave10 || slave20 "} agent{label " slave10 || slave20 "}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册