diff --git a/mantle/kola/tests/coretest/core.go b/mantle/kola/tests/coretest/core.go index 7238d7326cd197734b4aed508e55d4a0cbd8e580..d02ea0bab4c4b547c07048a381a41e334447e274 100644 --- a/mantle/kola/tests/coretest/core.go +++ b/mantle/kola/tests/coretest/core.go @@ -64,8 +64,8 @@ func init() { ClusterSize: 1, Flags: []register.Flag{register.RequiresInternetAccess}, NativeFuncs: map[string]register.NativeFuncWrap{ - "PodmanEcho": register.CreateNativeFuncWrap(TestPodmanEcho), - "PodmanWgetHead": register.CreateNativeFuncWrap(TestPodmanWgetHead), + "DockerEcho": register.CreateNativeFuncWrap(TestDockerEcho), + "DockerWgetHead": register.CreateNativeFuncWrap(TestDockerWgetHead), }, Distros: []string{"fcos", "nestos"}, }) @@ -86,7 +86,7 @@ func init() { NativeFuncs: map[string]register.NativeFuncWrap{ "ServicesDisabled": register.CreateNativeFuncWrap(TestServicesDisabledRHCOS), }, - Distros: []string{"rhcos", "nestos"}, + Distros: []string{"rhcos"}, }) } @@ -101,12 +101,20 @@ func TestPortSsh() error { func TestDockerEcho() error { //t.Parallel() - return util.RunCmdTimeout(DockerTimeout, "docker", "run", "docker.io/busybox", "echo") + util.RunCmdTimeout(DockerTimeout, "sudo", "systemctl", "start", "docker") + return util.RunCmdTimeout(DockerTimeout, "sudo", "docker", "run", "docker.io/busybox", "echo") } func TestDockerPing() error { //t.Parallel() - return util.RunCmdTimeout(DockerTimeout, "docker", "run", "docker.io/busybox", "ping", "-c4", "baidu.com") + util.RunCmdTimeout(DockerTimeout, "sudo", "systemctl", "start", "docker") + return util.RunCmdTimeout(DockerTimeout, "sudo", "docker", "run", "docker.io/busybox", "ping", "-c4", "baidu.com") +} + +func TestDockerWgetHead() error { + //t.Parallel() + util.RunCmdTimeout(DockerTimeout, "sudo", "systemctl", "start", "docker") + return util.RunCmdTimeout(DockerTimeout, "sudo", "docker", "run", "docker.io/busybox", "wget", "--spider", "https://nestos.org.cn/kola/hotspot.txt") } func TestPodmanEcho() error { diff --git a/mantle/kola/tests/misc/network.go b/mantle/kola/tests/misc/network.go index 95cfa7086c25840b448a85a523c6fd26d145ef05..86536896d3155af51e13916b6e2ea2535050368e 100644 --- a/mantle/kola/tests/misc/network.go +++ b/mantle/kola/tests/misc/network.go @@ -40,11 +40,12 @@ func init() { UserData: conf.EmptyIgnition(), }) // TODO: rewrite test for NetworkManager + // This test is for systemd-networkd.service, but using NetworkManager.service now. register.RegisterTest(®ister.Test{ Run: NetworkInitramfsSecondBoot, ClusterSize: 1, Name: "nestos.network.initramfs.second-boot", - ExcludeDistros: []string{"fcos", "rhcos"}, + ExcludeDistros: []string{"fcos", "rhcos", "nestos"}, }) // This test follows the same network configuration used on https://github.com/RHsyseng/rhcos-slb // with a slight change, where the MCO script is run from ignition: https://github.com/RHsyseng/rhcos-slb/blob/main/setup-ovs.sh. diff --git a/mantle/kola/tests/podman/podman.go b/mantle/kola/tests/podman/podman.go index 2c311c3978f91d69b6fe8b820ebc01cf2bd557d1..da34b1808e79ffa78f10b8aaa07ac9160954822b 100644 --- a/mantle/kola/tests/podman/podman.go +++ b/mantle/kola/tests/podman/podman.go @@ -35,6 +35,7 @@ func init() { Run: podmanBaseTest, ClusterSize: 1, Name: `podman.base`, + RequiredTag: "podman", }) // These remaining tests use networking, and hence don't work reliably on RHCOS // right now due to due to https://bugzilla.redhat.com/show_bug.cgi?id=1757572 @@ -45,15 +46,17 @@ func init() { Flags: []register.Flag{register.RequiresInternetAccess}, // For pulling nginx Distros: []string{"fcos", "nestos"}, FailFast: true, + RequiredTag: "podman", }) register.RegisterTest(®ister.Test{ Run: podmanNetworksReliably, ClusterSize: 1, Name: `podman.network-single`, // Not really but podman blows up if there's no /etc/resolv.conf - Tags: []string{kola.NeedsInternetTag}, - Distros: []string{"fcos", "nestos"}, - Timeout: 20 * time.Minute, + Tags: []string{kola.NeedsInternetTag}, + Distros: []string{"fcos", "nestos"}, + Timeout: 20 * time.Minute, + RequiredTag: "podman", }) // https://github.com/coreos/mantle/pull/1080 // register.RegisterTest(®ister.Test{ diff --git a/mantle/kola/tests/rpmostree/deployments.go b/mantle/kola/tests/rpmostree/deployments.go index b9d5a45237408e28ce69f0a152ccc48108b11a54..dce8d96e02535df5f68f0ee4fe200145e854ce7a 100644 --- a/mantle/kola/tests/rpmostree/deployments.go +++ b/mantle/kola/tests/rpmostree/deployments.go @@ -201,7 +201,7 @@ func rpmOstreeInstallUninstall(c cluster.TestCluster) { m := c.Machines()[0] - _, err := c.SSH(m, `sudo wget -P /var/home/nest http://www.nestos.org.cn/kola/aht-dummy-1.0-1.noarch.rpm`) + _, err := c.SSH(m, `sudo bash -c 'cd ${HOME} && curl -O http://www.nestos.org.cn/kola/aht-dummy-1.0-1.noarch.rpm'`) if err != nil { c.Fatal(err) }