Commit abb5bc4f authored by Mohammed Ismail's avatar Mohammed Ismail

[CI] reverting back to support the develop branch

Signed-off-by: default avatarMohammed Ismail <mohammed.ismail@openairinterface.org>
parent 6ae0335b
...@@ -40,8 +40,8 @@ def rem_rhel_host_user = "" ...@@ -40,8 +40,8 @@ def rem_rhel_host_user = ""
def rem_rhel8_resource = params.PodmanContainers def rem_rhel8_resource = params.PodmanContainers
// Tags/Branches to use // Tags/Branches to use
def amf_tag = params.amfTag def amf_tag = "develop"
def amf_branch = params.amfBranch def amf_branch = "develop"
// 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.
...@@ -180,8 +180,7 @@ pipeline { ...@@ -180,8 +180,7 @@ pipeline {
// In case of push to `develop` branch we build from scratch // In case of push to `develop` branch we build from scratch
myShCmd('docker build --no-cache --target oai-amf --tag oai-amf:' + amf_tag + ' --file docker/Dockerfile.ubuntu.18.04 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/amf_docker_image_build.log 2>&1', rem_u18_host_flag, rem_u18_host_user, rem_u18_host) myShCmd('docker build --no-cache --target oai-amf --tag oai-amf:' + amf_tag + ' --file docker/Dockerfile.ubuntu.18.04 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/amf_docker_image_build.log 2>&1', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
} }
else { if ("MERGE".equals(env.gitlabActionType)) {
//if ("MERGE".equals(env.gitlabActionType)) {
try { try {
// Checking if the CI Base image is still there. // Checking if the CI Base image is still there.
// If the inspect command fails, it's not there. If it passes, let remove tag. // If the inspect command fails, it's not there. If it passes, let remove tag.
......
...@@ -818,7 +818,7 @@ class HtmlReport(): ...@@ -818,7 +818,7 @@ class HtmlReport():
if self.git_pull_request: if self.git_pull_request:
result = re.search('oai-amf *ci-tmp', line) result = re.search('oai-amf *ci-tmp', line)
else: else:
result = re.search('oai-amf *temp', line) result = re.search('oai-amf *develop', line)
if result is not None: if result is not None:
result = re.search('ago *([0-9A-Z]+)', line) result = re.search('ago *([0-9A-Z]+)', line)
if result is not None: if result is not None:
......
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