From 300af2c5ab34e665c36369f48d4b337dda708b12 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Sun, 14 Nov 2021 17:36:21 +0100
Subject: [PATCH] fix(ci): proper usage of flag for merge request
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-tmp-multi-enb-benetel | 4 ++--
ci-scripts/Jenkinsfile-tmp-multi-enb-benetel-long | 4 ++--
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa | 9 ++++++---
ci-scripts/Jenkinsfile-trig-nsa | 8 ++++----
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel b/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel
index 8ac2e6adff..195456da11 100644
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel
@@ -134,8 +134,8 @@ pipeline {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
- if (params.eNB_AllowMergeRequestProcess!= null) {
- eNB_AllowMergeRequestProcess = params.eNB_AllowMergeRequestProcess
+ if (params.eNB_mergeRequest!= null) {
+ eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
diff --git a/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel-long b/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel-long
index fb7f3738d2..3a002b3748 100644
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel-long
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-benetel-long
@@ -145,8 +145,8 @@ pipeline {
// eNB_CommitID = params.eNB_CommitID
//}
echo "eNB_CommitID : ${eNB_CommitID}"
- if (params.eNB_AllowMergeRequestProcess!= null) {
- eNB_AllowMergeRequestProcess = params.eNB_AllowMergeRequestProcess
+ if (params.eNB_mergeRequest!= null) {
+ eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
diff --git a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
index c9585f115d..dd9fbbd03c 100644
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -137,8 +137,8 @@ pipeline {
eNB_CommitID = params.eNB_CommitID
}
echo "eNB_CommitID : ${eNB_CommitID}"
- if (params.eNB_AllowMergeRequestProcess!= null) {
- eNB_AllowMergeRequestProcess = params.eNB_AllowMergeRequestProcess
+ if (params.eNB_mergeRequest!= null) {
+ eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
@@ -168,6 +168,9 @@ pipeline {
if (params.ADB_Credentials == null) {
allParametersPresent = false
}
+ if (params.DataBaseHost == "none") {
+ DataBaseHost = pythonExecutor
+ }
if (allParametersPresent) {
echo "All parameters are present"
@@ -319,7 +322,7 @@ pipeline {
}
stage ("SQL Collect"){
when {
- expression { DataBaseHost != "none" }
+ expression { params.DataBaseHost != "none" }
}
agent {label DataBaseHost}
steps {
diff --git a/ci-scripts/Jenkinsfile-trig-nsa b/ci-scripts/Jenkinsfile-trig-nsa
index 40d74f4da0..27e27c8426 100644
--- a/ci-scripts/Jenkinsfile-trig-nsa
+++ b/ci-scripts/Jenkinsfile-trig-nsa
@@ -53,7 +53,7 @@ pipeline {
string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
- booleanParam(name: 'eNB_AllowMergeRequestProcess', value: Boolean.valueOf(ALLOW_MERGE))
+ booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
]
//calling NSA 2x2
build job: "RAN-NSA-2x2-Module-OAIEPC", wait : true, propagate : false, parameters: [
@@ -61,7 +61,7 @@ pipeline {
string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
- booleanParam(name: 'eNB_AllowMergeRequestProcess', value: Boolean.valueOf(ALLOW_MERGE))
+ booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
]
//calling LTE 2x2
build job: "RAN-LTE-2x2-Module-OAIEPC", wait : true, propagate : false, parameters: [
@@ -69,7 +69,7 @@ pipeline {
string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
- booleanParam(name: 'eNB_AllowMergeRequestProcess', value: Boolean.valueOf(ALLOW_MERGE))
+ booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
]
//calling SA
build job: "RAN-SA-Module-CN5G", wait : true, propagate : false, parameters: [
@@ -77,7 +77,7 @@ pipeline {
string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
- booleanParam(name: 'eNB_AllowMergeRequestProcess', value: Boolean.valueOf(ALLOW_MERGE))
+ booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
]
}
--
2.26.2