Commit 84a148a0 authored by Raphael Defosseux's avatar Raphael Defosseux

[CI] fix to enable RHEL stages

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@openairinterface.org>
parent 68c247b8
...@@ -43,13 +43,13 @@ def rem_rhel8_resource = params.PodmanContainers ...@@ -43,13 +43,13 @@ def rem_rhel8_resource = params.PodmanContainers
def smf_tag = "develop" def smf_tag = "develop"
def smf_branch = "develop" def smf_branch = "develop"
// Merge Request Link
def gitlabMergeRequestLink
// We are using a base image to speed up CI build. // We are using a base image to speed up CI build.
// This base image is potentially subject to changes over time. // This base image is potentially subject to changes over time.
def SMF_BASE_IMAGE_TAG = params.SmfBaseImageTag def SMF_BASE_IMAGE_TAG = params.SmfBaseImageTag
// Merge Request Link
def gitlabMergeRequestLink
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
// Pipeline start // Pipeline start
pipeline { pipeline {
...@@ -89,11 +89,19 @@ pipeline { ...@@ -89,11 +89,19 @@ pipeline {
echo "1st Node is ${NODE_NAME}" echo "1st Node is ${NODE_NAME}"
echo "2nd Node is ${rem_u18_host}" echo "2nd Node is ${rem_u18_host}"
} else { } else {
echo "U18 Node is ${NODE_NAME}" echo "U18 Node is ${NODE_NAME}"
} }
} else { } else {
echo "Node is ${NODE_NAME}" echo "Node is ${NODE_NAME}"
} }
if (params.Remote_RHEL_Server_Flag != null) {
rem_rhel_host_flag = params.Remote_RHEL_Server_Flag
if (rem_rhel_host_flag) {
rem_rhel_host = params.Remote_RHEL_Server_Name
rem_rhel_host_user = params.Remote_RHEL_Server_Login
echo "RHEL Node is ${rem_rhel_host}"
}
}
echo "Git URL is ${GIT_URL}" echo "Git URL is ${GIT_URL}"
if ("MERGE".equals(env.gitlabActionType)) { if ("MERGE".equals(env.gitlabActionType)) {
...@@ -128,6 +136,7 @@ pipeline { ...@@ -128,6 +136,7 @@ pipeline {
smf_tag = "ci-tmp" smf_tag = "ci-tmp"
rhel_smf_tag = 'ci-tmp-pr-' + env.gitlabMergeRequestIid + '-' + shortenShaOne rhel_smf_tag = 'ci-tmp-pr-' + env.gitlabMergeRequestIid + '-' + shortenShaOne
smf_branch = env.gitlabSourceBranch smf_branch = env.gitlabSourceBranch
echo "MR TAG is ${rhel_smf_tag}"
} else { } else {
echo "======== THIS IS A PUSH REQUEST ========" echo "======== THIS IS A PUSH REQUEST ========"
echo "Git Branch is ${GIT_BRANCH}" echo "Git Branch is ${GIT_BRANCH}"
...@@ -456,7 +465,6 @@ OAI CI Team''', ...@@ -456,7 +465,6 @@ OAI CI Team''',
to: gitCommitAuthorEmailAddr to: gitCommitAuthorEmailAddr
} }
} }
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment