Skip to content

Commit 507ef79

Browse files
author
Kimmo Lepikko
committed
Updated C027 Raas location
1 parent 90dac35 commit 507ef79

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

Jenkinsfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if (env.MBED_OS_REVISION == '') {
1818

1919
// Map RaaS instances to corresponding test suites
2020
def raas = [
21-
"cellular_smoke_ublox_c027.json": "8072"
21+
"cellular_smoke_ublox_c027.json": "levi"
2222
//"cellular_smoke_mtb_mts_dragonfly.json": "8119"
2323
]
2424

@@ -69,12 +69,12 @@ if (params.smoke_test == true) {
6969
for(int i = 0; i < raas.size(); i++) {
7070
for(int j = 0; j < sockets.size(); j++) {
7171
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)
7373
def socket = sockets.get(j)
7474

7575
// 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)
7878
}
7979
}
8080
} else {
@@ -126,13 +126,13 @@ def buildStep(target, compilerLabel, toolchain, socket) {
126126
}
127127
}
128128

129-
def run_smoke(raasPort, suite_to_run, toolchains, targets, socket) {
129+
def run_smoke(raasName, suite_to_run, toolchains, targets, socket) {
130130
return {
131131
env.RAAS_USERNAME = "user"
132132
env.RAAS_PASSWORD = "user"
133133
// Remove .json from suite name
134134
def suiteName = suite_to_run.substring(0, suite_to_run.indexOf('.'))
135-
stage ("smoke_${raasPort}_${suiteName}") {
135+
stage ("smoke_${raasName}_${suiteName}") {
136136
//node is actually the type of machine, i.e., mesh-test boild down to linux
137137
node ("linux") {
138138
deleteDir()
@@ -155,8 +155,10 @@ def run_smoke(raasPort, suite_to_run, toolchains, targets, socket) {
155155
unstash "${target}_${toolchain}_${socket}"
156156
}
157157
}
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}/**/*"
160162
}
161163
}
162164
}

0 commit comments

Comments
 (0)