Add build artifact for Apple Hypervisor

this pr introduces a build artifact for the Apple Hypervisor (applehv). It is a qemu-variant in raw disk form and gzipped (macos has gz support natively) See coreos/fedora-coreos-tracker#1533 and coreos/fedora-coreos-tracker#1548 Signed-off-by: Brent Baude <[email protected]>
coreos · Aug 23, 2023 · 3ac75dc · 3ac75dc
1 parent 0c97893
commit 3ac75dc
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 4 deletions.
diff --git a/cmd/coreos-assembler.go b/cmd/coreos-assembler.go
@@ -14,7 +14,8 @@ import (
 // commands we'd expect to use in the local dev path
 var buildCommands = []string{"init", "fetch", "build", "run", "prune", "clean", "list"}
 var advancedBuildCommands = []string{"buildfetch", "buildupload", "oc-adm-release", "push-container", "upload-oscontainer", "buildextend-extensions"}
-var buildextendCommands = []string{"aliyun", "aws", "azure", "digitalocean", "exoscale", "extensions", "extensions-container", "gcp", "hashlist-experimental", "hyperv", "ibmcloud", "kubevirt", "legacy-oscontainer", "live", "metal", "metal4k", "nutanix", "openstack", "qemu", "secex", "virtualbox", "vmware", "vultr"}
+var buildextendCommands = []string{"aliyun", "applehv", "aws", "azure", "digitalocean", "exoscale", "extensions", "extensions-container", "gcp", "hashlist-experimental", "hyperv", "ibmcloud", "kubevirt", "legacy-oscontainer", "live", "metal", "metal4k", "nutanix", "openstack", "qemu", "secex", "virtualbox", "vmware", "vultr"}
+
 var utilityCommands = []string{"aws-replicate", "compress", "copy-container", "koji-upload", "kola", "push-container-manifest", "remote-build-container", "remote-prune", "remote-session", "sign", "tag", "update-variant"}
 var otherCommands = []string{"shell", "meta"}
 

diff --git a/pkg/builds/cosa_v1.go b/pkg/builds/cosa_v1.go
@@ -1,7 +1,7 @@
 package builds
 
 // generated by 'make schema'
-// source hash: a5fec50536bd4c2eed006dfb897b3b40fdf50393a0e3e32edf874b4e200e4e4d
+// source hash: 73eba405214212d41c92204c48cde7bede443c9815395676b5e9c52531d08a61
 
 type AdvisoryDiff []AdvisoryDiffItems
 
@@ -84,6 +84,7 @@ type Build struct {
 
 type BuildArtifacts struct {
  Aliyun *Artifact `json:"aliyun,omitempty"`
+ AppleHv *Artifact `json:"applehv,omitempty"`
  Aws *Artifact `json:"aws,omitempty"`
  Azure *Artifact `json:"azure,omitempty"`
  AzureStack *Artifact `json:"azurestack,omitempty"`

diff --git a/pkg/builds/schema_doc.go b/pkg/builds/schema_doc.go
@@ -1,5 +1,5 @@
 // Generated by ./generate-schema.sh
-// Source hash: a5fec50536bd4c2eed006dfb897b3b40fdf50393a0e3e32edf874b4e200e4e4d
+// Source hash: 73eba405214212d41c92204c48cde7bede443c9815395676b5e9c52531d08a61
 // DO NOT EDIT
 
 package builds
@@ -449,6 +449,7 @@ var generatedSchemaJSON = `{
  "ostree"
  ],
  "optional": [
+ "applehv",
  "aliyun",
  "aws",
  "azure",
@@ -621,6 +622,12 @@ var generatedSchemaJSON = `{
  "title": "Vultr",
  "$ref": "#/definitions/artifact"
  },
+ "applehv": {
+ "$id": "#/properties/images/properties/applehv",
+ "type": "object",
+ "title": "AppleHV",
+ "$ref": "#/definitions/artifact"
+ },
  "aliyun": {
  "$id": "#/properties/images/properties/aliyun",
  "type": "object",

diff --git a/src/cmd-buildextend-applehv b/src/cmd-buildextend-applehv
@@ -0,0 +1 @@
+cmd-artifact-disk
diff --git a/src/cmd-generate-release-meta b/src/cmd-generate-release-meta
@@ -132,7 +132,7 @@ def append_build(out, input_):
  # build the architectures dict
  arch_dict = {"media": {}}
  ensure_dup(input_, arch_dict, "ostree-commit", "commit")
- platforms = ["aliyun", "aws", "azure", "azurestack", "digitalocean", "exoscale", "gcp", "hyperv", "ibmcloud", "kubevirt", "metal", "nutanix", "openstack", "powervs", "qemu", "virtualbox", "vmware", "vultr", "qemu-secex"]
+ 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:
  if input_.get("images", {}).get(platform, None) is not None:
  print(f" - {platform}")

diff --git a/src/cosalib/qemuvariants.py b/src/cosalib/qemuvariants.py
@@ -52,6 +52,12 @@
  "image_format": "qcow2",
  "platform": "aliyun",
  },
+ "applehv": {
+ "image_format": "raw",
+ "image_suffix": "raw.gz",
+ "platform": "applehv",
+ "compression": "gzip"
+ },
  "azure": {
  "image_format": "vpc",
  "image_suffix": "vhd",

diff --git a/src/v1.json b/src/v1.json
@@ -443,6 +443,7 @@
  "ostree"
  ],
  "optional": [
+ "applehv",
  "aliyun",
  "aws",
  "azure",
@@ -615,6 +616,12 @@
  "title": "Vultr",
  "$ref": "#/definitions/artifact"
  },
+ "applehv": {
+ "$id": "#/properties/images/properties/applehv",
+ "type": "object",
+ "title": "AppleHV",
+ "$ref": "#/definitions/artifact"
+ },
  "aliyun": {
  "$id": "#/properties/images/properties/aliyun",
  "type": "object",