113 lines
3.5 KiB
Diff
113 lines
3.5 KiB
Diff
From 944bb85144ba4aa2fe3e7d92406bf097c80ae511 Mon Sep 17 00:00:00 2001
|
|
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
|
Date: Wed, 21 Aug 2024 22:22:49 +0000
|
|
Subject: [PATCH] Remove wsl and minimal-raw image types
|
|
|
|
Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
|
---
|
|
internal/cloudapi/v2/compose_test.go | 12 ------------
|
|
.../osbuild/images/pkg/distro/rhel8/distro.go | 4 ----
|
|
.../osbuild/images/pkg/distro/rhel9/distro.go | 4 ----
|
|
3 files changed, 20 deletions(-)
|
|
|
|
diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go
|
|
index edd6ad8..e82d6fd 100644
|
|
--- a/internal/cloudapi/v2/compose_test.go
|
|
+++ b/internal/cloudapi/v2/compose_test.go
|
|
@@ -583,24 +583,12 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) {
|
|
expectedImageType: "live-installer",
|
|
expectedTargetName: target.TargetNameAWSS3,
|
|
},
|
|
- {
|
|
- requestedImageType: ImageTypesMinimalRaw,
|
|
- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9},
|
|
- expectedImageType: "minimal-raw",
|
|
- expectedTargetName: target.TargetNameAWSS3,
|
|
- },
|
|
{
|
|
requestedImageType: ImageTypesOci,
|
|
requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9},
|
|
expectedImageType: "oci",
|
|
expectedTargetName: target.TargetNameOCIObjectStorage,
|
|
},
|
|
- {
|
|
- requestedImageType: ImageTypesWsl,
|
|
- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9},
|
|
- expectedImageType: "wsl",
|
|
- expectedTargetName: target.TargetNameAWSS3,
|
|
- },
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(string(tt.requestedImageType), func(t *testing.T) {
|
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
|
|
index 3beca5e..baf472b 100644
|
|
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
|
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go
|
|
@@ -242,7 +242,6 @@ func newDistro(name string, minor int) *distribution {
|
|
x86_64.addImageTypes(
|
|
&platform.X86{},
|
|
tarImgType(),
|
|
- wslImgType(),
|
|
)
|
|
|
|
aarch64.addImageTypes(
|
|
@@ -260,7 +259,6 @@ func newDistro(name string, minor int) *distribution {
|
|
aarch64.addImageTypes(
|
|
&platform.Aarch64{},
|
|
tarImgType(),
|
|
- wslImgType(),
|
|
)
|
|
|
|
bareMetalAarch64Platform := &platform.Aarch64{
|
|
@@ -283,7 +281,6 @@ func newDistro(name string, minor int) *distribution {
|
|
aarch64.addImageTypes(
|
|
rawAarch64Platform,
|
|
amiImgTypeAarch64(rd),
|
|
- minimalRawImgType(rd),
|
|
)
|
|
|
|
ppc64le.addImageTypes(
|
|
@@ -343,7 +340,6 @@ func newDistro(name string, minor int) *distribution {
|
|
|
|
x86_64.addImageTypes(
|
|
rawUEFIx86Platform,
|
|
- minimalRawImgType(rd),
|
|
)
|
|
|
|
if rd.isRHEL() {
|
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
|
|
index 44b7e44..498b417 100644
|
|
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
|
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go
|
|
@@ -265,19 +265,16 @@ func newDistro(name string, minor int) *distribution {
|
|
BIOS: false,
|
|
UEFIVendor: rd.vendor,
|
|
},
|
|
- minimalrawImgType,
|
|
)
|
|
|
|
x86_64.addImageTypes(
|
|
&platform.X86{},
|
|
tarImgType,
|
|
- wslImgType,
|
|
)
|
|
|
|
aarch64.addImageTypes(
|
|
&platform.Aarch64{},
|
|
tarImgType,
|
|
- wslImgType,
|
|
)
|
|
|
|
aarch64.addImageTypes(
|
|
@@ -295,7 +292,6 @@ func newDistro(name string, minor int) *distribution {
|
|
},
|
|
UEFIVendor: rd.vendor,
|
|
},
|
|
- minimalrawImgType,
|
|
)
|
|
|
|
aarch64.addImageTypes(
|
|
--
|
|
2.43.5
|
|
|