From 8f50effd794b81ce11c7139159347832f4b9a026 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 18 Nov 2020 13:49:26 +0100 Subject: [PATCH] Fix --log-level=debug for buildah When using it without '=' it breaks somewhere down the road of the process.execute call. Change-Id: I5a7bb54f954b64a08ef1d534d3d471cd673327ab Signed-off-by: Bogdan Dobrelya --- tripleo_common/image/builder/buildah.py | 2 +- tripleo_common/tests/image/builder/test_buildah.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tripleo_common/image/builder/buildah.py b/tripleo_common/image/builder/buildah.py index ce5338ef3..f69a0504f 100644 --- a/tripleo_common/image/builder/buildah.py +++ b/tripleo_common/image/builder/buildah.py @@ -94,7 +94,7 @@ class BuildahBuilder(base.BaseBuilder): # from userspace, which would be slower. self.buildah_cmd = ['sudo', 'buildah'] if self.debug: - self.buildah_cmd.append('--log-level debug') + self.buildah_cmd.append('--log-level=debug') def _find_container_dir(self, container_name): """Return the path of the Dockerfile/Containerfile directory. diff --git a/tripleo_common/tests/image/builder/test_buildah.py b/tripleo_common/tests/image/builder/test_buildah.py index 2d547413b..da0168c02 100644 --- a/tripleo_common/tests/image/builder/test_buildah.py +++ b/tripleo_common/tests/image/builder/test_buildah.py @@ -110,7 +110,7 @@ class TestBuildahBuilder(base.TestCase): dest = '127.0.0.1:8787/master/fedora-binary-fedora-base:latest' container_build_path = WORK_DIR + '/' + 'fedora-base' logfile = '/tmp/kolla/fedora-base/fedora-base-build.log' - buildah_cmd_build = ['--log-level debug', 'bud', '--format', 'docker', + buildah_cmd_build = ['--log-level=debug', 'bud', '--format', 'docker', '--tls-verify=False', '--logfile', logfile, '-t', dest, container_build_path] args.extend(buildah_cmd_build)