Skip to content

Commit

Permalink
cmd-generate-release-meta: allow missing base-oscontainer
Browse files Browse the repository at this point in the history
Commit 21802b6 ("cmd-generate-release-meta: inject `oci-image` key in
release metadata") broke the OKD pipeline which builds the OCI image,
but doesn't push it using cosa.

Down the line, this should resolve itself by having OKD and OCP's node
image being built the same way as layered images.

But for now let's relax the check here and just inject the OCI image
information if it's available.
  • Loading branch information
jlebon authored and dustymabe committed Nov 18, 2024
1 parent 2ba481e commit 3d7af88
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/cmd-generate-release-meta
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,11 @@ def append_build(out, input_):
arch_dict = {"media": {}}
ensure_dup(input_, arch_dict, "ostree-commit", "commit")

# we always expect base-oscontainer so error out if missing
assert 'base-oscontainer' in input_
arch_dict['oci-image'] = populate_oci_image(input_['buildid'], input_['base-oscontainer'])
# within the CoreOS pipelines, we always expect base-oscontainer to be set,
# but this script is also currently used by OKD but they only care about
# bootimages
if 'base-oscontainer' in input_:
arch_dict['oci-image'] = populate_oci_image(input_['buildid'], input_['base-oscontainer'])

platforms = ["aliyun", "applehv", "aws", "azure", "azurestack", "digitalocean", "exoscale", "gcp", "hyperv", "ibmcloud", "kubevirt", "metal", "nutanix", "openstack", "powervs", "qemu", "virtualbox", "vmware", "vultr", "qemu-secex"]
for platform in platforms:
Expand Down

0 comments on commit 3d7af88

Please sign in to comment.