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

CI: use intermediate variable for YAML file

Browse Source 
This harmonizes with DeployObject() (which uses the same variable) and
shortens some lines for readability.
This commit is contained in:
Robert Schmidt
2025-11-13 14:33:35 +01:00
parent b6bda6d974
commit 8cf7dd8607
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_containerize.py
+5 -4
View File
@@ -760,17 +760,18 @@ class Containerize():
logging.debug(f'\u001B[1m Undeploying OAI Object from server: {node}\u001B[0m') logging.debug(f'\u001B[1m Undeploying OAI Object from server: {node}\u001B[0m')
yaml = self.yamlPath.strip('/') yaml = self.yamlPath.strip('/')
wd = f'{lSourcePath}/{yaml}' wd = f'{lSourcePath}/{yaml}'
wd_yaml = f'{wd}/docker-compose.y*ml'
with cls_cmd.getConnection(node) as ssh: with cls_cmd.getConnection(node) as ssh:
ExistEnvFilePrint(ssh, wd) ExistEnvFilePrint(ssh, wd)
services = GetRunningServices(ssh, f"{wd}/docker-compose.y*ml") services = GetRunningServices(ssh, wd_yaml)
copyin_res = None copyin_res = None
if services is not None: if services is not None:
all_serv = " ".join([s for s, _ in services]) all_serv = " ".join([s for s, _ in services])
ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}') ssh.run(f'docker compose -f {wd_yaml} stop -- {all_serv}')
copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, f"{wd}/docker-compose.y*ml", ctx) for s, _ in services] copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, wd_yaml, ctx) for s, _ in services]
else: else:
logging.warning('could not identify services to stop => no log file') logging.warning('could not identify services to stop => no log file')
ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v') ssh.run(f'docker compose -f {wd_yaml} down -v')
ssh.run(f'rm {wd}/.env') ssh.run(f'rm {wd}/.env')
if not copyin_res: if not copyin_res:
HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['Could not copy logfile(s)']) HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['Could not copy logfile(s)'])