Skip to content

Commit 574b0e2

Browse files
alavissdustymabe
authored andcommitted
Add Oracle Cloud Infrastructure images
1 parent d1835f1 commit 574b0e2

12 files changed

+103
-6
lines changed

cmd/coreos-assembler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// commands we'd expect to use in the local dev path
1515
var buildCommands = []string{"init", "fetch", "build", "osbuild", "run", "prune", "clean", "list"}
1616
var advancedBuildCommands = []string{"buildfetch", "buildupload", "oc-adm-release", "push-container"}
17-
var buildextendCommands = []string{"aliyun", "applehv", "aws", "azure", "digitalocean", "exoscale", "extensions-container", "gcp", "hyperv", "ibmcloud", "kubevirt", "live", "metal", "metal4k", "nutanix", "openstack", "qemu", "secex", "virtualbox", "vmware", "vultr"}
17+
var buildextendCommands = []string{"aliyun", "applehv", "aws", "azure", "digitalocean", "exoscale", "extensions-container", "gcp", "hyperv", "ibmcloud", "kubevirt", "live", "metal", "metal4k", "nutanix", "openstack", "oraclecloud", "qemu", "secex", "virtualbox", "vmware", "vultr"}
1818

1919
var utilityCommands = []string{"aws-replicate", "coreos-prune", "compress", "copy-container", "diff", "koji-upload", "kola", "push-container-manifest", "remote-build-container", "remote-session", "sign", "tag", "update-variant"}
2020
var otherCommands = []string{"shell", "meta"}

pkg/builds/cosa_v1.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package builds
22

33
// generated by 'make schema'
4-
// source hash: 73f31a82a5800f256c5348e87fd4ef041b4e592b0145bac503de36dd584f596f
4+
// source hash: 4bb5641ee8c32b122c412cbaefe3d068685ea6cbffcf3162e600a01268c92146
55

66
type AdvisoryDiff []AdvisoryDiffItems
77

@@ -117,6 +117,7 @@ type BuildArtifacts struct {
117117
Nutanix *Artifact `json:"nutanix,omitempty"`
118118
OciManifest *Artifact `json:"oci-manifest,omitempty"`
119119
OpenStack *Artifact `json:"openstack,omitempty"`
120+
OracleCloudInfrastructure *Artifact `json:"oraclecloud,omitempty"`
120121
Ostree Artifact `json:"ostree"`
121122
PowerVirtualServer *Artifact `json:"powervs,omitempty"`
122123
ProxmoxVe *Artifact `json:"proxmoxve,omitempty"`

pkg/builds/schema_doc.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Generated by ./generate-schema.sh
2-
// Source hash: 73f31a82a5800f256c5348e87fd4ef041b4e592b0145bac503de36dd584f596f
2+
// Source hash: 4bb5641ee8c32b122c412cbaefe3d068685ea6cbffcf3162e600a01268c92146
33
// DO NOT EDIT
44

55
package builds
@@ -517,6 +517,7 @@ var generatedSchemaJSON = `{
517517
"metal4k",
518518
"nutanix",
519519
"openstack",
520+
"oraclecloud",
520521
"proxmoxve",
521522
"qemu",
522523
"virtualbox",
@@ -647,6 +648,12 @@ var generatedSchemaJSON = `{
647648
"title": "OpenStack",
648649
"$ref": "#/definitions/artifact"
649650
},
651+
"oraclecloud": {
652+
"$id": "#/properties/images/properties/oraclecloud",
653+
"type": "object",
654+
"title": "Oracle Cloud Infrastructure",
655+
"$ref": "#/definitions/artifact"
656+
},
650657
"virtualbox": {
651658
"$id": "#/properties/images/properties/virtualbox",
652659
"type": "object",

src/cmd-buildextend-oraclecloud

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cmd-osbuild

src/cmd-coreos-prune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Build = collections.namedtuple("Build", ["id", "images", "arch", "meta_json"])
5555
# set metadata caching to 5m
5656
CACHE_MAX_AGE_METADATA = 60 * 5
5757
# These lists are up to date as of schema hash
58-
# 73f31a82a5800f256c5348e87fd4ef041b4e592b0145bac503de36dd584f596f. If changing
58+
# 4bb5641ee8c32b122c412cbaefe3d068685ea6cbffcf3162e600a01268c92146. If changing
5959
# this hash, ensure that the list of SUPPORTED and UNSUPPORTED artifacts below
6060
# is up to date.
6161
SUPPORTED = ["amis", "aws-winli", "gcp"]

src/cmd-generate-release-meta

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ def append_build(out, input_):
152152
platforms = ["aliyun", "applehv", "aws", "azure", "azurestack",
153153
"digitalocean", "exoscale", "gcp", "hetzner", "hyperv",
154154
"ibmcloud", "kubevirt", "metal", "nutanix", "openstack",
155-
"proxmoxve", "powervs", "qemu", "virtualbox", "vmware",
156-
"vultr", "qemu-secex"]
155+
"oraclecloud", "proxmoxve", "powervs", "qemu", "virtualbox",
156+
"vmware", "vultr", "qemu-secex"]
157157
for platform in platforms:
158158
if input_.get("images", {}).get(platform, None) is not None:
159159
print(f" - {platform}")

src/cmd-osbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ declare -A SUPPORTED_PLATFORMS=(
2424
['metal']='raw'
2525
['nutanix']='qcow2'
2626
['openstack']='qcow2'
27+
['oraclecloud']='qcow2'
2728
['proxmoxve']='qcow2'
2829
['qemu']='qcow2'
2930
['qemu-secex']='qcow2'
@@ -272,6 +273,7 @@ main() {
272273
"cmd-buildextend-kubevirt") platforms=(kubevirt);;
273274
"cmd-buildextend-nutanix") platforms=(nutanix);;
274275
"cmd-buildextend-openstack") platforms=(openstack);;
276+
"cmd-buildextend-oraclecloud") platforms=(oraclecloud);;
275277
"cmd-buildextend-proxmoxve") platforms=(proxmoxve);;
276278
"cmd-buildextend-vultr") platforms=(vultr);;
277279
*) fatal "called as unexpected name $0";;

src/cosalib/qemuvariants.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@
109109
"image_format": "qcow2",
110110
"platform": "openstack",
111111
},
112+
"oraclecloud": {
113+
"image_format": "qcow2",
114+
"platform": "oraclecloud",
115+
},
112116
"nutanix": {
113117
"image_format": "qcow2",
114118
"platform": "nutanix",

src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,8 @@ pipelines:
762762
path: platform.metal.ipp.yaml
763763
- mpp-import-pipelines:
764764
path: platform.openstack.ipp.yaml
765+
- mpp-import-pipelines:
766+
path: platform.oraclecloud.ipp.yaml
765767
- mpp-import-pipelines:
766768
path: platform.qemu.ipp.yaml
767769
- mpp-import-pipelines:

src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,8 @@ pipelines:
776776
path: platform.kubevirt.ipp.yaml
777777
- mpp-import-pipelines:
778778
path: platform.openstack.ipp.yaml
779+
- mpp-import-pipelines:
780+
path: platform.oraclecloud.ipp.yaml
779781
- mpp-import-pipelines:
780782
path: platform.proxmoxve.ipp.yaml
781783
- mpp-import-pipelines:

0 commit comments

Comments
 (0)