maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr

Browse Source
This commit is contained in:
Florian Kaltenberger
2018-11-05 20:59:40 +01:00
parent 737ad46a29 9d30c9b027
commit 3a8fe0f31d
2 changed files with 155 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/Jenkinsfile-gitlab
-20
View File
@@ -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 {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
@@ -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 {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
@@ -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 {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
@@ -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 {
] ]
} }
} }
} catch (Exception e) {
currentBuild.result = 'FAILURE'
}
} }
} }
post { post {
@@ -527,8 +509,6 @@ pipeline {
} }
} }
} }
}
}
post { post {
always { always {
script { script {
ci-scripts/Jenkinsfile-tmp-ran
+1 -2
View File
@@ -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 {
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 {
} }
} }
} }
}
stage ("Terminate") { stage ("Terminate") {
parallel { parallel {
stage('Terminate UE') { stage('Terminate UE') {