@@ -18,7 +18,7 @@ if (env.MBED_OS_REVISION == '') {
18
18
19
19
// Map RaaS instances to corresponding test suites
20
20
def raas = [
21
- " cellular_smoke_ublox_c027.json" : " 8072 "
21
+ " cellular_smoke_ublox_c027.json" : " levi "
22
22
// "cellular_smoke_mtb_mts_dragonfly.json": "8119"
23
23
]
24
24
@@ -69,12 +69,12 @@ if (params.smoke_test == true) {
69
69
for (int i = 0 ; i < raas. size(); i++ ) {
70
70
for (int j = 0 ; j < sockets. size(); j++ ) {
71
71
def suite_to_run = raas. keySet(). asList(). get(i)
72
- def raasPort = raas. get(suite_to_run)
72
+ def raasName = raas. get(suite_to_run)
73
73
def socket = sockets. get(j)
74
74
75
75
// Parallel execution needs unique step names. Remove .json file ending.
76
- def smokeStep = " ${ raasPort } ${ suite_to_run.substring(0, suite_to_run.indexOf('.'))} "
77
- parallelRunSmoke[smokeStep] = run_smoke(raasPort , suite_to_run, toolchains, targets, socket)
76
+ def smokeStep = " ${ raasName } ${ suite_to_run.substring(0, suite_to_run.indexOf('.'))} "
77
+ parallelRunSmoke[smokeStep] = run_smoke(raasName , suite_to_run, toolchains, targets, socket)
78
78
}
79
79
}
80
80
} else {
@@ -126,13 +126,13 @@ def buildStep(target, compilerLabel, toolchain, socket) {
126
126
}
127
127
}
128
128
129
- def run_smoke (raasPort , suite_to_run , toolchains , targets , socket ) {
129
+ def run_smoke (raasName , suite_to_run , toolchains , targets , socket ) {
130
130
return {
131
131
env. RAAS_USERNAME = " user"
132
132
env. RAAS_PASSWORD = " user"
133
133
// Remove .json from suite name
134
134
def suiteName = suite_to_run. substring(0 , suite_to_run. indexOf(' .' ))
135
- stage (" smoke_${ raasPort } _${ suiteName} " ) {
135
+ stage (" smoke_${ raasName } _${ suiteName} " ) {
136
136
// node is actually the type of machine, i.e., mesh-test boild down to linux
137
137
node (" linux" ) {
138
138
deleteDir()
@@ -155,8 +155,10 @@ def run_smoke(raasPort, suite_to_run, toolchains, targets, socket) {
155
155
unstash " ${ target} _${ toolchain} _${ socket} "
156
156
}
157
157
}
158
- execute(" python clitest.py --suitedir mbed-clitest-suites/suites/ --suite ${ suite_to_run} --type hardware --reset --raas 62.44.193.186:${ raasPort} --tcdir mbed-clitest-suites/cellular --failure_return_value -vvv -w --log log_${ raasPort} _${ suiteName} " )
159
- archive " log_${ raasPort} _${ suiteName} /**/*"
158
+ execute(" python clitest.py --suitedir mbed-clitest-suites/suites/ --suite ${ suite_to_run} --type hardware --reset \
159
+ --raas ${ raasName} .mbedcloudtesting.com:80 --tcdir mbed-clitest-suites/cellular --raas_queue --raas_queue_timeout 3600 \
160
+ --raas_share_allocs --failure_return_value -vvv -w --log log_${ raasName} _${ suiteName} " )
161
+ archive " log_${ raasName} _${ suiteName} /**/*"
160
162
}
161
163
}
162
164
}
0 commit comments