Commit 9d30c9b0 authored by Raphael Defosseux's avatar Raphael Defosseux

CI: lock mechanism improvement

 -- in slave job, the lock is now properly done for the whole job
 -- in master job, all slave jobs are really sent in parallel
    they should now now appear as failed (if fails)
 cherry-picked from develop (47437903)
Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent cfef9ef0
This diff is collapsed.
...@@ -61,6 +61,7 @@ pipeline { ...@@ -61,6 +61,7 @@ pipeline {
options { options {
disableConcurrentBuilds() disableConcurrentBuilds()
ansiColor('xterm') ansiColor('xterm')
lock (ciSmartPhoneResource)
} }
// the following parameter options are commented out so it shows the ones // the following parameter options are commented out so it shows the ones
// that you SHALL have to run the job. // that you SHALL have to run the job.
...@@ -184,7 +185,6 @@ pipeline { ...@@ -184,7 +185,6 @@ pipeline {
steps { steps {
script { script {
dir ('ci-scripts') { dir ('ci-scripts') {
lock (ciSmartPhoneResource) {
try { try {
echo "\u2705 \u001B[32m${testStageName}\u001B[0m" echo "\u2705 \u001B[32m${testStageName}\u001B[0m"
withCredentials([ withCredentials([
...@@ -197,7 +197,6 @@ pipeline { ...@@ -197,7 +197,6 @@ pipeline {
} catch (Exception e) { } catch (Exception e) {
currentBuild.result = 'FAILURE' currentBuild.result = 'FAILURE'
} }
}
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment