particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop common.CurrentArch() in favor of osbuild/images

Browse source 
Drop `common.CurrentArch()` implementation and use
`arch.Current().String()` from the osbuild/images instead.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2024-01-19 21:05:46 +01:00 • committed by Achilleas Koutsou
parent c4e5ab5aca
commit 43e87632fb
11 changed files with 20 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/osbuild-image-tests/main_test.go
View file

@ -29,7 +29,6 @@ import (
"github.com/osbuild/osbuild-composer/internal/boot/azuretest"
"github.com/osbuild/osbuild-composer/internal/boot/openstacktest"
"github.com/osbuild/osbuild-composer/internal/boot/vmwaretest"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/test"
)
@ -353,7 +352,7 @@ func testBootUsingAWS(t *testing.T, imagePath string) {
"aarch64": "t4g.micro",
}
instanceType, exists := instanceTypeForArch[common.CurrentArch()]
instanceType, exists := instanceTypeForArch[arch.Current().String()]
if !exists {
panic("unsupported AWS arch")
}
@ -407,7 +406,7 @@ func testBootUsingAzure(t *testing.T, imagePath string) {
func testBootUsingOpenStack(t *testing.T, imagePath string) {
creds, err := openstack.AuthOptionsFromEnv()
currentArch := common.CurrentArch()
currentArch := arch.Current().String()
// skip on aarch64 because we don't have aarch64 openstack or kvm machines
if currentArch == arch.ARCH_AARCH64.String() {
@ -632,7 +631,7 @@ func runTests(t *testing.T, cases []string) {
err = json.NewDecoder(f).Decode(&testcase)
require.NoErrorf(t, err, "%s: cannot decode test case", p)
currentArch := common.CurrentArch()
currentArch := arch.Current().String()
if testcase.ComposeRequest.Arch != currentArch {
t.Skipf("the required arch is %s, the current arch is %s", testcase.ComposeRequest.Arch, currentArch)
}