Skip to content

tests: update podman.workflow and remove fcos.internet #3939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dustymabe merged 2 commits into from
Nov 14, 2024
Merged

tests: update podman.workflow and remove fcos.internet #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13da33e
kola/podman.go: use fedora container in podman.workflow
marmijo Nov 13, 2024
2f0c777
kola/core.go: remove fcos.internet test
marmijo Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions mantle/kola/tests/coretest/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/coreos/coreos-assembler/mantle/kola/register"
"github.com/coreos/coreos-assembler/mantle/platform"
"github.com/coreos/coreos-assembler/mantle/platform/machine/qemu"
"github.com/coreos/coreos-assembler/mantle/util"
)

const (
Expand Down Expand Up @@ -91,21 +90,6 @@ func init() {
// only work on x86_64 and aarch64.
Architectures: []string{"x86_64", "aarch64"},
})
// TODO: Enable DockerPing/DockerEcho once fixed
// TODO: Only enable PodmanPing on non qemu. Needs:
// https://github.com/coreos/mantle/issues/1132
register.RegisterTest(&register.Test{
Name: "fcos.internet",
Description: "Verify that podman echo and get head work.",
Run: InternetTests,
ClusterSize: 1,
Tags: []string{kola.NeedsInternetTag},
NativeFuncs: map[string]register.NativeFuncWrap{
"PodmanEcho": register.CreateNativeFuncWrap(TestPodmanEcho),
"PodmanWgetHead": register.CreateNativeFuncWrap(TestPodmanWgetHead),
},
Distros: []string{"fcos"},
})
register.RegisterTest(&register.Test{
Name: "rootfs.uuid",
Description: "Verify that the root disk's GUID was set to a random one on first boot.",
Expand Down Expand Up @@ -179,31 +163,6 @@ func TestPortSsh() error {
return nil
}

func TestDockerEcho() error {
//t.Parallel()
return util.RunCmdTimeout(DockerTimeout, "docker", "run", "busybox", "echo")
}

func TestDockerPing() error {
//t.Parallel()
return util.RunCmdTimeout(DockerTimeout, "docker", "run", "busybox", "ping", "-c4", "coreos.com")
}

func TestPodmanEcho() error {
//t.Parallel()
return util.RunCmdTimeout(DockerTimeout, "podman", "run", "busybox", "echo")
}

func TestPodmanPing() error {
//t.Parallel()
return util.RunCmdTimeout(DockerTimeout, "podman", "run", "busybox", "ping", "-c4", "coreos.com")
}

func TestPodmanWgetHead() error {
//t.Parallel()
return util.RunCmdTimeout(DockerTimeout, "podman", "run", "busybox", "wget", "--spider", "http://fedoraproject.org/static/hotspot.txt")
}

// This execs gdbus, because we need to change uses to test perms.
func TestDbusPerms() error {
c := exec.Command(
Expand Down
7 changes: 4 additions & 3 deletions mantle/kola/tests/podman/podman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,17 @@ func podmanWorkflow(c cluster.TestCluster) {
m := c.Machines()[0]

// Test: Verify container can run with volume mount and port forwarding
image := "docker.io/library/nginx"
wwwRoot := "/usr/share/nginx/html"
image := "quay.io/fedora/fedora"
wwwRoot := "/var/html"
var id string

c.Run("run", func(c cluster.TestCluster) {
dir := c.MustSSH(m, `mktemp -d`)
cmd := fmt.Sprintf("echo TEST PAGE > %s/index.html", string(dir))
c.RunCmdSync(m, cmd)

cmd = fmt.Sprintf("sudo podman run -d -p 80:80 -v %s/index.html:%s/index.html:z %s", string(dir), wwwRoot, image)
webServerCmd := fmt.Sprintf("sh -c 'dnf install -y python3 && python3 -m http.server -d %s 80'", wwwRoot)
cmd = fmt.Sprintf("sudo podman run -d -p 80:80 -v %s/index.html:%s/index.html:z %s %s", string(dir), wwwRoot, image, webServerCmd)
out := c.MustSSH(m, cmd)
id = string(out)[0:64]

Expand Down
Loading