From 9d4337c55d00671af24304770fd3cf28245e7143 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 6 Nov 2024 13:52:00 +0100 Subject: [PATCH] Do not retrieve deployment logs during DeployObject Since commit 041b2b2d7a5173feb8dbeddccc42f30fe321573d, the CI main loop iterates over all steps, even if there has been a problem during an earlier XML step. In all cases, UndeployObject() is marked to always run, as we always need to make sure that all deployed services are terminated. UndeployObject() always recovers logs. Hence, it's not necessary to do it here as well; it leads to duplicated logs. This is visible in all pipeline with a failed deployment: the logs appear twice. --- ci-scripts/cls_containerize.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 029a970acd..fa4afb865c 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -1027,10 +1027,6 @@ class Containerize(): containerName = GetContainerName(ssh, svc, f"{wd}/docker-compose.y*ml") healthy = GetContainerHealth(ssh, containerName) if not healthy: - tgtlogfile = f'{svc}-{HTML.testCase_id}.log' - logging.warning(f"Deployment Failed: Trying to copy container logs to {tgtlogfile}") - yaml_dir = yaml.split('/')[-1] - CopyinContainerLog(ssh, lSourcePath, yaml_dir, containerName, tgtlogfile) imagesInfo += [f"Failed to deploy: service {svc}"] fstatus = False else: