Skip to content

oscontainer: Handle being run without a cosa build #1670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 20, 2020
Merged

oscontainer: Handle being run without a cosa build #1670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/oscontainer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,19 +199,20 @@ def oscontainer_build(containers_storage, tmpdir, src, ref, image_name_and_tag,
if ostree_version is not None:
config += ['-l', 'version=' + ostree_version]

with open('builds/builds.json') as fb:
builds = json.load(fb)['builds']
latest_build = builds[0]['id']
arch = cmdlib.get_basearch()
metapath = f"builds/{latest_build}/{arch}/meta.json"
with open(metapath) as f:
meta = json.load(f)
rhcos_commit = meta['coreos-assembler.container-config-git']['commit']
imagegit = meta.get('coreos-assembler.container-image-git')
if imagegit is not None:
cosa_commit = imagegit['commit']
config += ['-l', f"com.coreos.coreos-assembler-commit={cosa_commit}"]
config += ['-l', f"com.coreos.redhat-coreos-commit={rhcos_commit}"]
if os.path.isfile('builds/builds.json'):
with open('builds/builds.json') as fb:
Comment on lines +202 to +203
Copy link
Member

@jlebon jlebon Aug 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine, though the $compiled_language programmer in me wants to do

try:
  with open(...) as fb:
    ...
except FileNotFoundError:
  pass

builds = json.load(fb)['builds']
latest_build = builds[0]['id']
arch = cmdlib.get_basearch()
metapath = f"builds/{latest_build}/{arch}/meta.json"
with open(metapath) as f:
meta = json.load(f)
rhcos_commit = meta['coreos-assembler.container-config-git']['commit']
imagegit = meta.get('coreos-assembler.container-image-git')
if imagegit is not None:
cosa_commit = imagegit['commit']
config += ['-l', f"com.coreos.coreos-assembler-commit={cosa_commit}"]
config += ['-l', f"com.coreos.redhat-coreos-commit={rhcos_commit}"]

if display_name is not None:
config += ['-l', 'io.openshift.build.version-display-names=machine-os=' + display_name,
Expand Down