diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-29 11:18:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-29 11:18:43 +0000 |
| commit | 226d3c554db1dc71af71ac67ca38e53b325642e1 (patch) | |
| tree | 1d7952422a41cb2845120d33b2687f8c7c6a4e0e /kolla | |
| parent | 29fbfbe5c45067aa406eeb908c17064ed01ac3c9 (diff) | |
| parent | 1d204e759ae5ac46b3fb6fe4ecfcfd819b8392b6 (diff) | |
| download | kolla-226d3c554db1dc71af71ac67ca38e53b325642e1.tar.gz kolla-226d3c554db1dc71af71ac67ca38e53b325642e1.zip | |
Merge "Fix build errors missing podman/docker module"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/image/tasks.py | 21 |
1 files 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') |