openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Force docker format" into stable/stein

This commit is contained in:
Zuul 2020-01-27 22:02:32 +00:00 committed by Gerrit Code Review
parent cba9fa4e2a 5575f381aa
commit 7d42075848
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,10 @@ class BuildahBuilder(base.BaseBuilder):
# TODO(emilien): Stop ignoring TLS. The deployer should either secure # TODO(emilien): Stop ignoring TLS. The deployer should either secure
# the registry or add it to insecure_registries. # the registry or add it to insecure_registries.
logfile = container_build_path + '/' + container_name + '-build.log' logfile = container_build_path + '/' + container_name + '-build.log'
args = self.buildah_cmd + ['bud', '--tls-verify=False', '--logfile', # TODO(aschultz): drop --format docker when oci format is properly
# supported by the undercloud registry
args = self.buildah_cmd + ['bud', '--format', 'docker',
'--tls-verify=False', '--logfile',
logfile, '-t', destination, logfile, '-t', destination,
container_build_path] container_build_path]
print("Building %s image with: %s" % (container_name, ' '.join(args))) print("Building %s image with: %s" % (container_name, ' '.join(args)))

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

@ -35,7 +35,8 @@ class TestBuildahBuilder(base.TestCase):
dest = '127.0.0.1:8787/master/fedora-binary-fedora-base:latest' dest = '127.0.0.1:8787/master/fedora-binary-fedora-base:latest'
container_build_path = WORK_DIR + '/' + 'fedora-base' container_build_path = WORK_DIR + '/' + 'fedora-base'
logfile = '/tmp/kolla/fedora-base/fedora-base-build.log' logfile = '/tmp/kolla/fedora-base/fedora-base-build.log'
buildah_cmd_build = ['bud', '--tls-verify=False', '--logfile', buildah_cmd_build = ['bud', '--format', 'docker',
'--tls-verify=False', '--logfile',
logfile, '-t', dest, container_build_path] logfile, '-t', dest, container_build_path]
args.extend(buildah_cmd_build) args.extend(buildah_cmd_build)
bb(WORK_DIR, DEPS).build('fedora-base', container_build_path) bb(WORK_DIR, DEPS).build('fedora-base', container_build_path)