diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-25 16:36:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 16:36:01 -0400 |
| commit | 05bdb4139a02eb35220c23b8ae8fe355f6d91406 (patch) | |
| tree | 59e3b673f018d25dde266b158c6b799c65c603f6 /pkg/machine/fcos.go | |
| parent | 181c9d3ee3ad4820b9ae91f1f02faf7b9e65fc87 (diff) | |
| parent | 833456e079c31111a15fedaa3ccd7f852e89e508 (diff) | |
| download | podman-05bdb4139a02eb35220c23b8ae8fe355f6d91406.tar.gz podman-05bdb4139a02eb35220c23b8ae8fe355f6d91406.tar.bz2 podman-05bdb4139a02eb35220c23b8ae8fe355f6d91406.zip | |
Merge pull request #13942 from baude/machinetests
Add podman machine test suite
Diffstat (limited to 'pkg/machine/fcos.go')
| -rw-r--r-- | pkg/machine/fcos.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go index 872ca889e..df58b8a1e 100644 --- a/pkg/machine/fcos.go +++ b/pkg/machine/fcos.go @@ -43,7 +43,7 @@ type FcosDownload struct { } func NewFcosDownloader(vmType, vmName, imageStream string) (DistributionDownload, error) { - info, err := getFCOSDownload(imageStream) + info, err := GetFCOSDownload(imageStream) if err != nil { return nil, err } @@ -79,7 +79,7 @@ func (f FcosDownload) Get() *Download { return &f.Download } -type fcosDownloadInfo struct { +type FcosDownloadInfo struct { CompressionType string Location string Release string @@ -139,7 +139,7 @@ func getStreamURL(streamType string) url2.URL { // This should get Exported and stay put as it will apply to all fcos downloads // getFCOS parses fedoraCoreOS's stream and returns the image download URL and the release version -func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) { // nolint:staticcheck,unparam +func GetFCOSDownload(imageStream string) (*FcosDownloadInfo, error) { //nolint:staticcheck var ( fcosstable stream.Stream altMeta release.Release @@ -150,8 +150,8 @@ func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) { // nolint: // fcos trees, we should remove it and re-release at least on // macs. // TODO: remove when podman4.0 is in coreos - // nolint:staticcheck - imageStream = "podman-testing" + + imageStream = "podman-testing" //nolint:staticcheck switch imageStream { case "podman-testing": @@ -194,7 +194,7 @@ func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) { // nolint: } disk := qcow2.Disk - return &fcosDownloadInfo{ + return &FcosDownloadInfo{ Location: disk.Location, Sha256Sum: disk.Sha256, CompressionType: "xz", @@ -228,7 +228,7 @@ func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) { // nolint: if disk == nil { return nil, fmt.Errorf("unable to pull VM image: no disk in stream") } - return &fcosDownloadInfo{ + return &FcosDownloadInfo{ Location: disk.Location, Release: qemu.Release, Sha256Sum: disk.Sha256, |