Skip to content

Commit

Permalink
minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
HuijingHei committed May 25, 2023
1 parent f929b8f commit 3dff7ab
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion mantle/kola/tests/rpmostree/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func init() {
Run: rpmOstreeInstallUninstall,
ClusterSize: 1,
Name: "rpmostree.install-uninstall",
Description: "Verifies rpm-ostree supports installing and uninstalling rpms.",
Description: "Verify rpm-ostree supports installing and uninstalling rpms.",
Tags: []string{"rpm-ostree", kola.NeedsInternetTag}, // these need network to retrieve bits
// this Ignition config lands the dummy RPM
UserData: conf.Ignition(`{
Expand Down
14 changes: 6 additions & 8 deletions mantle/platform/api/gcloud/compute.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,13 @@ func (a *API) mkinstance(userdata, name string, keys []*agent.Key, opts platform
}
}
// attach aditional disk
if len(opts.AdditionalDisks) > 0 {
for _, spec := range opts.AdditionalDisks {
plog.Debugf("Parsing disk spec %q\n", spec)
disk, err := ParseDiskSpec(spec, a.options.Zone)
if err != nil {
return nil, fmt.Errorf("failed to parse spec %s: %w", spec, err)
}
instance.Disks = append(instance.Disks, disk)
for _, spec := range opts.AdditionalDisks {
plog.Debugf("Parsing disk spec %q\n", spec)
disk, err := ParseDiskSpec(spec, a.options.Zone)
if err != nil {
return nil, fmt.Errorf("failed to parse spec %s: %w", spec, err)
}
instance.Disks = append(instance.Disks, disk)
}
return instance, nil
}
Expand Down

0 comments on commit 3dff7ab

Please sign in to comment.