From dac4ceb7cba2a477f4712757fa16f9fc02e2fa40 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Fri, 22 Mar 2019 16:48:58 +0100
Subject: [PATCH] CI: adding call to new slave UE job from master pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-gitlab | 55 +++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index c1675e5992c..cd2d7836387 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -398,7 +398,7 @@ pipeline {
}
}
}
- stage ("Test FDD - Band 7 - B210") {
+ stage ("Test MONOLITHIC - FDD - Band 7 - B210") {
steps {
script {
if ("MERGE".equals(env.gitlabActionType)) {
@@ -449,7 +449,7 @@ pipeline {
}
}
}
- stage ("Test TDD - Band 40 - B210") {
+ stage ("Test MONOLITHIC - TDD - Band 40 - B210") {
steps {
script {
if ("MERGE".equals(env.gitlabActionType)) {
@@ -653,6 +653,57 @@ pipeline {
}
}
}
+ stage ("Test OAI UE Sniffing - FDD - Band 20 - B200") {
+ steps {
+ script {
+ if ("MERGE".equals(env.gitlabActionType)) {
+ //gitlabCommitStatus(name: "Test-OAI-UE-FDD-Band20") {
+ build job: 'UE-CI-FDD-Band20-B200',
+ parameters: [
+ string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+ string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
+ string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
+ booleanParam(name: 'eNB_mergeRequest', value: true),
+ string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+ ]
+ //}
+ } else {
+ //gitlabCommitStatus(name: "Test-OAI-UE-FDD-Band20") {
+ build job: 'UE-CI-FDD-Band20-B200',
+ parameters: [
+ string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+ string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
+ string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
+ booleanParam(name: 'eNB_mergeRequest', value: false)
+ ]
+ //}
+ }
+ }
+ }
+ post {
+ // In case of any non-success, we are retrieving the HTML report of the last completed
+ // slave job.
+ // The only drop-back is that we may retrieve the HTML report of a previous build
+ always {
+ script {
+ if (!fileExists('test_results-UE-CI-FDD-Band20-B200.html')) {
+ copyArtifacts(projectName: 'UE-CI-FDD-Band20-B200',
+ filter: 'test_results*.html',
+ selector: lastCompleted())
+ if (fileExists('test_results-UE-CI-FDD-Band20-B200.html')) {
+ sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' test_results-UE-CI-FDD-Band20-B200.html"
+ archiveArtifacts artifacts: 'test_results-UE-CI-FDD-Band20-B200.html'
+ }
+ }
+ }
+ }
+ failure {
+ script {
+ currentBuild.result = 'FAILURE'
+ }
+ }
+ }
+ }
}
post {
always {
--
GitLab