From 1d204e759ae5ac46b3fb6fe4ecfcfd819b8392b6 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 26 Sep 2023 21:38:07 +0200 Subject: Fix build errors missing podman/docker module Example: Traceback (most recent call last): File "/home/ubuntu/kolla/kolla/image/build.py", line 79, in run task.run() File "/home/ubuntu/kolla/kolla/image/tasks.py", line 144, in run self.builder(self.image) File "/home/ubuntu/kolla/kolla/image/tasks.py", line 424, in builder if isinstance(e, podman.errors.exceptions.BuildError): NameError: name 'podman' is not defined Change-Id: I947c77750b3ccfb975e010c2042a3716e3e46bde --- kolla/image/tasks.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kolla/image/tasks.py b/kolla/image/tasks.py index ada30d664..632239d34 100644 --- a/kolla/image/tasks.py +++ b/kolla/image/tasks.py @@ -417,15 +417,18 @@ class BuildTask(EngineTask): except engine.getEngineException(self.conf) as e: image.status = Status.ERROR - if isinstance(e, docker.errors.BuildError): - for line in e.build_log: - if 'stream' in line: - self.logger.error(line['stream'].strip()) - if isinstance(e, podman.errors.exceptions.BuildError): - for line in e.build_log: - line = json.loads(line) - if 'stream' in line: - self.logger.error(line['stream'].strip()) + if self.conf.engine == engine.Engine.DOCKER.value: + if isinstance(e, docker.errors.BuildError): + for line in e.build_log: + if 'stream' in line: + self.logger.error(line['stream'].strip()) + elif self.conf.engine == engine.Engine.PODMAN.value: + if isinstance(e, podman.errors.exceptions.BuildError): + for line in e.build_log: + line = json.loads(line) + if 'stream' in line: + self.logger.error(line['stream'].strip()) + self.logger.exception('Unknown container engine ' 'error when building') -- cgit v1.2.3