Commit 908636ea authored by Mohammed Ismail's avatar Mohammed Ismail

updated

parent ab76a99e
......@@ -156,12 +156,12 @@ class Containerize():
else:
result = re.search('all', self.imageKind)
if result is not None:
imageNames.append(('localhost/oai-enb', 'eNB'))
imageNames.append(('localhost/oai-gnb', 'gNB'))
imageNames.append(('localhost/oai-lte-ue', 'lteUE'))
imageNames.append(('localhost/oai-nr-ue', 'nrUE'))
imageNames.append(('oai-enb', 'eNB'))
imageNames.append(('oai-gnb', 'gNB'))
imageNames.append(('oai-lte-ue', 'lteUE'))
imageNames.append(('oai-nr-ue', 'nrUE'))
if len(imageNames) == 0:
imageNames.append(('localhost/oai-enb', 'eNB'))
imageNames.append(('oai-enb', 'eNB'))
# Workaround for some servers, we need to erase completely the workspace
if self.forcedWorkspaceCleanup:
......@@ -198,7 +198,9 @@ class Containerize():
mySSH.command('git merge --ff origin/' + self.ranTargetBranch + ' -m "Temporary merge for CI"', '\$', 5)
# if asterix, copy the entitlement and subscription manager configurations
if self.host == 'asterix':
if self.host == 'asterix':
mySSH.command('mkdir -p tmp/ca/', '\$', 5)
mySSH.command('mkdir -p tmp/entitlement/', '\$', 5)
mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca/', '\$', 5)
mySSH.command('sudo cp /etc/pki/entitlement/*.pem tmp/entitlement/', '\$', 5)
......@@ -215,7 +217,7 @@ class Containerize():
if self.host == 'Ubuntu':
sharedimage = 'ran-build'
elif self.host == 'Red Hat':
sharedimage = 'localhost/ran-build'
sharedimage = 'ran-build'
mySSH.command(self.cli + ' build --target ' + sharedimage + ' --tag '+ sharedimage + ':' + imageTag + ' --file docker/Dockerfile.ran' + self.dockerfileprefix + ' --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > cmake_targets/log/ran-build.log 2>&1', '\$', 800)
# Build the target image(s)
previousImage = sharedimage + ':' + imageTag
......
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