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
...@@ -328,12 +328,9 @@ pipeline { ...@@ -328,12 +328,9 @@ pipeline {
} }
} }
} }
stage ("Test on CI bench #1") {
stages {
stage ("Test FDD - Band 7 - B210") { stage ("Test FDD - Band 7 - B210") {
steps { steps {
script { script {
try {
if ("MERGE".equals(env.gitlabActionType)) { if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-FDD-Band7") { gitlabCommitStatus(name: "Test-FDD-Band7") {
build job: 'eNB-CI-FDD-Band7-B210', build job: 'eNB-CI-FDD-Band7-B210',
...@@ -355,9 +352,6 @@ pipeline { ...@@ -355,9 +352,6 @@ pipeline {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
...@@ -382,7 +376,6 @@ pipeline { ...@@ -382,7 +376,6 @@ pipeline {
stage ("Test TDD - Band 40 - B210") { stage ("Test TDD - Band 40 - B210") {
steps { steps {
script { script {
try {
if ("MERGE".equals(env.gitlabActionType)) { if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-TDD-Band40") { gitlabCommitStatus(name: "Test-TDD-Band40") {
build job: 'eNB-CI-TDD-Band40-B210', build job: 'eNB-CI-TDD-Band40-B210',
...@@ -404,9 +397,6 @@ pipeline { ...@@ -404,9 +397,6 @@ pipeline {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
...@@ -431,7 +421,6 @@ pipeline { ...@@ -431,7 +421,6 @@ pipeline {
stage ("Test IF4p5 - FDD - Band 7 - B210") { stage ("Test IF4p5 - FDD - Band 7 - B210") {
steps { steps {
script { script {
try {
if ("MERGE".equals(env.gitlabActionType)) { if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") { gitlabCommitStatus(name: "Test-IF4p5-FDD-Band7") {
build job: 'eNB-CI-IF4p5-FDD-Band7-B210', build job: 'eNB-CI-IF4p5-FDD-Band7-B210',
...@@ -453,9 +442,6 @@ pipeline { ...@@ -453,9 +442,6 @@ pipeline {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
...@@ -480,7 +466,6 @@ pipeline { ...@@ -480,7 +466,6 @@ pipeline {
stage ("Test IF4p5 - TDD - Band 40 - B210") { stage ("Test IF4p5 - TDD - Band 40 - B210") {
steps { steps {
script { script {
try {
if ("MERGE".equals(env.gitlabActionType)) { if ("MERGE".equals(env.gitlabActionType)) {
gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") { gitlabCommitStatus(name: "Test-IF4p5-TDD-Band40") {
build job: 'eNB-CI-IF4p5-TDD-Band40-B210', build job: 'eNB-CI-IF4p5-TDD-Band40-B210',
...@@ -502,9 +487,6 @@ pipeline { ...@@ -502,9 +487,6 @@ pipeline {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
...@@ -527,8 +509,6 @@ pipeline { ...@@ -527,8 +509,6 @@ pipeline {
} }
} }
} }
}
}
post { post {
always { always {
script { script {
......
...@@ -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([
...@@ -201,7 +201,6 @@ pipeline { ...@@ -201,7 +201,6 @@ pipeline {
} }
} }
} }
}
stage ("Terminate") { stage ("Terminate") {
parallel { parallel {
stage('Terminate UE') { stage('Terminate UE') {
......
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