From ea864398dcc6f921a3c6bf21b156851751ccb9ed Mon Sep 17 00:00:00 2001 From: Nestor Acuna Blanco Date: Mon, 11 Nov 2024 10:52:27 +0000 Subject: [PATCH] feat: enable Ubuntu common-instancetypes for s390x This distribution works mostly out of the box; it only requires a compatible container disk image. Signed-off-by: Nestor Acuna Blanco --- tests/functests/instancetype_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/functests/instancetype_test.go b/tests/functests/instancetype_test.go index 1ad03fdf..bf730bf2 100644 --- a/tests/functests/instancetype_test.go +++ b/tests/functests/instancetype_test.go @@ -169,13 +169,17 @@ var _ = Describe("Common instance types func tests", func() { []testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}), Entry("[test_id:TODO] RHEL 10", rhel10ContainerDisk, map[string]string{"amd64": "rhel.10", "arm64": "rhel.10.arm64"}, []testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}), - Entry("[test_id:10741] Ubuntu 18.04", ubuntu1804ContainerDisk, map[string]string{"amd64": "ubuntu"}, + Entry("[test_id:10741] Ubuntu 18.04", ubuntu1804ContainerDisk, + map[string]string{"amd64": "ubuntu"}, []testFn{expectSSHToRunCommandOnLinux("ubuntu")}), - Entry("[test_id:10742] Ubuntu 20.04", ubuntu2004ContainerDisk, map[string]string{"amd64": "ubuntu", "arm64": "ubuntu"}, + Entry("[test_id:10742] Ubuntu 20.04", ubuntu2004ContainerDisk, + map[string]string{"amd64": "ubuntu", "arm64": "ubuntu", "s390x": "ubuntu"}, []testFn{expectSSHToRunCommandOnLinux("ubuntu")}), - Entry("[test_id:10743] Ubuntu 22.04", ubuntu2204ContainerDisk, map[string]string{"amd64": "ubuntu", "arm64": "ubuntu"}, + Entry("[test_id:10743] Ubuntu 22.04", ubuntu2204ContainerDisk, + map[string]string{"amd64": "ubuntu", "arm64": "ubuntu", "s390x": "ubuntu"}, []testFn{expectSSHToRunCommandOnLinux("ubuntu")}), - Entry("[test_id:TODO] Ubuntu 24.04", ubuntu2404ContainerDisk, map[string]string{"amd64": "ubuntu", "arm64": "ubuntu"}, + Entry("[test_id:TODO] Ubuntu 24.04", ubuntu2404ContainerDisk, + map[string]string{"amd64": "ubuntu", "arm64": "ubuntu", "s390x": "ubuntu"}, []testFn{expectSSHToRunCommandOnLinux("ubuntu")}), Entry("[test_id:TODO] OpenSUSE Tumbleweed", openSUSETumbleweedContainerDisk, map[string]string{"amd64": "opensuse.tumbleweed"}, []testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("opensuse")}),