Skip to content

Commit 3d7af88

Browse files
jlebondustymabe
authored andcommitted
cmd-generate-release-meta: allow missing base-oscontainer
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.
1 parent 2ba481e commit 3d7af88

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/cmd-generate-release-meta

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,11 @@ def append_build(out, input_):
143143
arch_dict = {"media": {}}
144144
ensure_dup(input_, arch_dict, "ostree-commit", "commit")
145145

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

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

0 commit comments

Comments
 (0)