distro/fedora: remove empty s390x architecture
Fedora distro definition contained an empty `s390x` architecture with no image types added to it. Let's remove it from the distro definition, since it's adding no value in its current form. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
parent
7c9d671eae
commit
1d37647506
2 changed files with 8 additions and 10 deletions
|
|
@ -893,11 +893,6 @@ func newDistro(version int) distro.Distro {
|
|||
distro: &rd,
|
||||
}
|
||||
|
||||
s390x := architecture{
|
||||
distro: &rd,
|
||||
name: distro.S390xArchName,
|
||||
}
|
||||
|
||||
ociImgType := qcow2ImgType
|
||||
ociImgType.name = "oci"
|
||||
|
||||
|
|
@ -1101,8 +1096,6 @@ func newDistro(version int) distro.Distro {
|
|||
minimalrawImgType,
|
||||
)
|
||||
|
||||
s390x.addImageTypes(nil)
|
||||
|
||||
rd.addArches(x86_64, aarch64, s390x)
|
||||
rd.addArches(x86_64, aarch64)
|
||||
return &rd
|
||||
}
|
||||
|
|
|
|||
|
|
@ -494,7 +494,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
|
|||
|
||||
func TestFedora_ListArches(t *testing.T) {
|
||||
arches := fedora.NewF37().ListArches()
|
||||
assert.Equal(t, []string{"aarch64", "s390x", "x86_64"}, arches)
|
||||
assert.Equal(t, []string{"aarch64", "x86_64"}, arches)
|
||||
}
|
||||
|
||||
func TestFedora37_GetArch(t *testing.T) {
|
||||
|
|
@ -510,7 +510,12 @@ func TestFedora37_GetArch(t *testing.T) {
|
|||
name: "aarch64",
|
||||
},
|
||||
{
|
||||
name: "s390x",
|
||||
name: "s390x",
|
||||
errorExpected: true,
|
||||
},
|
||||
{
|
||||
name: "ppc64le",
|
||||
errorExpected: true,
|
||||
},
|
||||
{
|
||||
name: "foo-arch",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue