GCP schema changes

dustymabe · May 21, 2020 · aebe946 · aebe946
1 parent 0c1213b
commit aebe946
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/mantle/cmd/kola/kola.go b/mantle/cmd/kola/kola.go
@@ -250,6 +250,7 @@ func writeProps() error {
 	}
 	type GCE struct {
 		Image       string `json:"image"`
+		Project     string `json:"project"`
 		MachineType string `json:"type"`
 	}
 	type OpenStack struct {
@@ -316,6 +317,7 @@ func writeProps() error {
 		},
 		GCE: GCE{
 			Image:       kola.GCEOptions.Image,
+			Project:     kola.GCEOptions.Project,
 			MachineType: kola.GCEOptions.MachineType,
 		},
 		OpenStack: OpenStack{
@@ -577,7 +579,8 @@ func syncFindParentImageOptions() error {
 			return err
 		}
 	case "gce":
-		kola.GCEOptions.Image, err = parentCosaBuild.FindGCPImage()
+		kola.GCEOptions.Image, kola.GCEOptions.Project, err =
+			parentCosaBuild.FindGCPImage()
 		if err != nil {
 			return err
 		}

diff --git a/mantle/cosa/build.go b/mantle/cosa/build.go
@@ -74,11 +74,11 @@ func (build *Build) FindAMI(region string) (string, error) {
 	return "", fmt.Errorf("no AMI found for region %s", region)
 }
 
-func (build *Build) FindGCPImage() (string, error) {
+func (build *Build) FindGCPImage() (string, string, error) {
 	if build.Gcp != nil {
-		return build.Gcp.Image, nil
+		return build.Gcp.Image, build.Gcp.Project, nil
 	}
-	return "", errors.New("no GCP image found")
+	return "", "", errors.New("no GCP image found")
 }
 
 func (build *Build) WriteMeta(path string, validate bool) error {

diff --git a/mantle/cosa/cosa_v1.go b/mantle/cosa/cosa_v1.go
@@ -13,6 +13,13 @@ type Amis struct {
 	Snapshot string `json:"snapshot"`
 }
 
+type Gcp struct {
+	Image   string `json:"image"`
+	Project string `json:"project"`
+	URL     string `json:"url"`
+	Family  string `json:"family,omitempty"`
+}
+
 type Artifact struct {
 	Path               string `json:"path"`
 	Sha256             string `json:"sha256"`
@@ -40,7 +47,7 @@ type Build struct {
 	CosaImageVersion          int                     `json:"coreos-assembler.image-genver,omitempty"`
 	FedoraCoreOsParentCommit  string                  `json:"fedora-coreos.parent-commit,omitempty"`
 	FedoraCoreOsParentVersion string                  `json:"fedora-coreos.parent-version,omitempty"`
-	Gcp                       *Cloudartifact          `json:"gcp,omitempty"`
+	Gcp                       *Gcp                    `json:"gcp,omitempty"`
 	GitDirty                  string                  `json:"coreos-assembler.config-dirty,omitempty"`
 	ImageInputChecksum        string                  `json:"coreos-assembler.image-input-checksum,omitempty"`
 	InputHasOfTheRpmOstree    string                  `json:"rpm-ostree-inputhash"`