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

use archiveArtifact() for BuildProxy()

Browse Source
This commit is contained in:
Robert Schmidt
2025-08-06 12:24:30 +02:00
parent 1ffbba525d
commit 63f6368ca7
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_containerize.py
+3 -8
View File
@@ -534,7 +534,7 @@ class Containerize():
HTML.CreateHtmlTabFooter(False) HTML.CreateHtmlTabFooter(False)
return False return False
def BuildProxy(self, HTML): def BuildProxy(self, ctx, HTML):
svr = self.eNB_serverId[self.eNB_instance] svr = self.eNB_serverId[self.eNB_instance]
lIpAddr, lSourcePath = self.GetCredentials(svr) lIpAddr, lSourcePath = self.GetCredentials(svr)
logging.debug('Building on server: ' + lIpAddr) logging.debug('Building on server: ' + lIpAddr)
@@ -566,15 +566,10 @@ class Containerize():
if not success: if not success:
raise Exception("could not clone proxy repository") raise Exception("could not clone proxy repository")
filename = f'build_log_{self.testCase_id}' fullpath = f'{lSourcePath}/proxy_build.log'
fullpath = f'{lSourcePath}/{filename}'
ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1') ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
ssh.run(f'zip -r -qq {fullpath}.zip {fullpath}') archiveArtifact(ssh, ctx, fullpath)
local_file = f"{os.getcwd()}/../cmake_targets/log/{filename}.zip"
ssh.copyin(f'{fullpath}.zip', local_file)
# don't delete such that we might recover the zips
#ssh.run(f'rm -f {fullpath}.zip')
ssh.run('docker image prune --force') ssh.run('docker image prune --force')
ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}') ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
ci-scripts/main.py
+1 -1
View File
@@ -140,7 +140,7 @@ def ExecuteActionWithParam(action, ctx):
elif action == 'Build_Image': elif action == 'Build_Image':
success = CONTAINERS.BuildImage(HTML) success = CONTAINERS.BuildImage(HTML)
elif action == 'Build_Proxy': elif action == 'Build_Proxy':
success = CONTAINERS.BuildProxy(HTML) success = CONTAINERS.BuildProxy(ctx, HTML)
elif action == 'Build_Cluster_Image': elif action == 'Build_Cluster_Image':
success = CLUSTER.BuildClusterImage(HTML) success = CLUSTER.BuildClusterImage(HTML)
elif action == 'Build_Run_Tests': elif action == 'Build_Run_Tests':