openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Drop --layers from buildah"

This commit is contained in:
Zuul 2020-11-11 03:11:20 +00:00 committed by Gerrit Code Review
parent 52047ed483 76856521c5
commit 62fac3d9b2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/image/builder/buildah.py
View File

@ -166,7 +166,7 @@ class BuildahBuilder(base.BaseBuilder):
# TODO(aschultz): drop --format docker when oci format is properly
# supported by the undercloud registry
bud_args.extend(['--format', 'docker', '--tls-verify=False',
'--layers', '--logfile', logfile, '-t',
'--logfile', logfile, '-t',
self._get_destination(container_name),
container_build_path])
args = self.buildah_cmd + bud_args

6
tripleo_common/tests/image/builder/test_buildah.py
View File

@ -111,7 +111,7 @@ class TestBuildahBuilder(base.TestCase):
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',
'--tls-verify=False', '--layers', '--logfile',
'--tls-verify=False', '--logfile',
logfile, '-t', dest, container_build_path]
args.extend(buildah_cmd_build)
bb(WORK_DIR, DEPS, debug=True).build('fedora-base',
@ -131,7 +131,7 @@ class TestBuildahBuilder(base.TestCase):
container_build_path = WORK_DIR + '/' + 'fedora-base'
logfile = '/tmp/kolla/fedora-base/fedora-base-build.log'
buildah_cmd_build = ['bud', '--format', 'docker',
'--tls-verify=False', '--layers',
'--tls-verify=False',
'--logfile', logfile, '-t', dest,
container_build_path]
args.extend(buildah_cmd_build)
@ -154,7 +154,7 @@ class TestBuildahBuilder(base.TestCase):
buildah_cmd_build = ['bud', '--volume', '/etc/pki:/etc/pki',
'--volume', '/etc/dir2:/dir2',
'--format', 'docker',
'--tls-verify=False', '--layers',
'--tls-verify=False',
'--logfile', logfile, '-t', dest,
container_build_path]
args.extend(buildah_cmd_build)