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

CI: fixing slave pipelines

Browse Source 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2020-01-26 13:41:36 +01:00
parent 893e19fa16
commit 4eaadf8d82
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/Jenkinsfile-tmp-full-ran
+4 -4
View File
@@ -51,7 +51,7 @@ termStatusArray[termOAIUE] = false
def eNB_Repository
def eNB_Branch
def eNB_CommitID
def ranAllowMergeRequestProcess = false
def eNB_AllowMergeRequestProcess = false
def eNB_TargetBranch
def doEpcLogCollection = true
@@ -130,8 +130,8 @@ pipeline {
}
echo "eNB_CommitID : ${eNB_CommitID}"
if (params.eNB_mergeRequest != null) {
ranAllowMergeRequestProcess = params.eNB_mergeRequest
if (ranAllowMergeRequestProcess) {
eNB_AllowMergeRequestProcess = params.eNB_mergeRequest
if (eNB_AllowMergeRequestProcess) {
if (params.eNB_TargetBranch != null) {
eNB_TargetBranch = params.eNB_TargetBranch
} else {
@@ -168,7 +168,7 @@ pipeline {
if (allParametersPresent) {
echo "All parameters are present"
if (ranAllowMergeRequestProcess) {
if (eNB_AllowMergeRequestProcess) {
sh "git fetch"
sh "./ci-scripts/doGitLabMerge.sh --src-branch ${eNB_Branch} --src-commit ${eNB_CommitID} --target-branch ${eNB_TargetBranch} --target-commit latest"
} else {