fix(ci): proper usage of flag for merge request

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2021-11-14 17:36:21 +01:00
parent 76d299f127
commit 300af2c5ab
4 changed files with 14 additions and 11 deletions
+6 -3
View File
@@ -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 {