Skip to content

Split up-provider-podman-rootless-basic e2e test #1084

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
skevetter merged 1 commit into from
Aug 17, 2026
Merged

Split up-provider-podman-rootless-basic e2e test #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions .github/workflows/pr-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,16 @@ jobs:
job-timeout-minutes: 20
flake-attempts: 2

- label: up-provider-podman-rootless-exec
runner: ubuntu-latest
free-disk-space: false
install-kind: false
requires-secret: false
install-podman: rootless
test-timeout: 600s
job-timeout-minutes: 20
flake-attempts: 2

- label: up-provider-podman-rootless-lifecycle
runner: ubuntu-latest
free-disk-space: true
Expand Down Expand Up @@ -449,6 +459,16 @@ jobs:
job-timeout-minutes: 20
flake-attempts: 2

- label: up-provider-podman-rootful-lifecycle-2
runner: ubuntu-latest
free-disk-space: true
install-kind: false
requires-secret: false
install-podman: rootful
test-timeout: 600s
job-timeout-minutes: 20
flake-attempts: 2

- label: up-provider-podman-rootful-config
runner: ubuntu-latest
free-disk-space: true
Expand Down
114 changes: 0 additions & 114 deletions e2e/tests/up/provider_podman_rootful_lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"os"
"os/exec"
"path/filepath"
"strings"
"time"

Expand Down Expand Up @@ -220,119 +219,6 @@ var _ = ginkgo.Describe(
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
)

ginkgo.It(
"should run postAttachCommand on every attach",
func(ctx context.Context) {
tempDir, err := setupWorkspace(
"tests/up/testdata/docker-post-attach-every-time",
initialDir,
f,
)
framework.ExpectNoError(err)

err = f.DevsyUp(ctx, tempDir)
framework.ExpectNoError(err)

gomega.Eventually(func() string {
out, err := f.DevsySSH(
ctx, tempDir, "cat $HOME/attach-count.out 2>/dev/null",
)
if err != nil {
return ""
}
return strings.TrimSpace(out)
}).WithTimeout(15 * time.Second).WithPolling(1 * time.Second).Should(
gomega.Equal("1"),
)

err = f.DevsyUp(ctx, tempDir)
framework.ExpectNoError(err)

gomega.Eventually(func() string {
out, err := f.DevsySSH(
ctx, tempDir, "cat $HOME/attach-count.out 2>/dev/null",
)
if err != nil {
return ""
}
return strings.TrimSpace(out)
}).WithTimeout(15 * time.Second).WithPolling(1 * time.Second).Should(
gomega.Equal("2"),
)
},
ginkgo.SpecTimeout(
framework.TimeoutModerate(),
),
)

ginkgo.It(
"should run initializeCommand with object syntax",
func(ctx context.Context) {
tempDir, err := setupWorkspaceAndUp(
ctx,
"tests/up/testdata/docker-initcmd-parallel",
initialDir,
f,
)
framework.ExpectNoError(err)

one, err := os.ReadFile( //nolint:gosec // G304
filepath.Join(tempDir, "init-cmd-one.out"),
)
framework.ExpectNoError(err)
gomega.Expect(string(one)).To(gomega.Equal("initCmdOne"))

two, err := os.ReadFile( //nolint:gosec // G304
filepath.Join(tempDir, "init-cmd-two.out"),
)
framework.ExpectNoError(err)
gomega.Expect(string(two)).To(gomega.Equal("initCmdTwo"))
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
)

ginkgo.It(
"should inject secrets-file env into lifecycle commands",
func(ctx context.Context) {
tempDir, err := setupWorkspace(
"tests/up/testdata/docker-secrets-file",
initialDir,
f,
)
framework.ExpectNoError(err)

secretsDir, err := framework.CreateTempDir()
framework.ExpectNoError(err)
ginkgo.DeferCleanup(func() { _ = os.RemoveAll(secretsDir) })

secretsFile := filepath.Join(secretsDir, "secrets.json")
err = os.WriteFile(
secretsFile,
[]byte(
`{"MY_SECRET":"test-value-12345","ANOTHER_SECRET":"second-secret-42"}`,
),
0o600,
)
framework.ExpectNoError(err)

err = f.DevsyUp(ctx, tempDir, "--secrets-file", secretsFile)
framework.ExpectNoError(err)

out, err := f.DevsySSH(ctx, tempDir, "cat /tmp/secret-check.out")
framework.ExpectNoError(err)
gomega.Expect(strings.TrimSpace(out)).
To(gomega.Equal("test-value-12345"))

out, err = f.DevsySSH(
ctx, tempDir, "cat /tmp/another-secret-check.out",
)
framework.ExpectNoError(err)
gomega.Expect(strings.TrimSpace(out)).
To(gomega.Equal("second-secret-42"))
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
)
})
})
},
Expand Down
187 changes: 187 additions & 0 deletions e2e/tests/up/provider_podman_rootful_lifecycle_2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
package up

import (
"context"
"os"
"os/exec"
"path/filepath"
"strings"
"time"

"github.com/devsy-org/devsy/e2e/framework"
"github.com/devsy-org/devsy/pkg/docker"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
)

var _ = ginkgo.Describe(
"testing up command for podman provider",
ginkgo.Label("up-provider-podman-rootful-lifecycle-2"),
func() {
var initialDir string

ginkgo.BeforeEach(func() {
var err error
initialDir, err = os.Getwd()
framework.ExpectNoError(err)
})

ginkgo.Context("with rootful podman", func() {
var f *framework.Framework

//nolint:dupl // shared rootful podman wrapper setup across split files
ginkgo.BeforeEach(func(ctx context.Context) {
wrapper, err := os.Create( //nolint:gosec // G304: test-controlled path
initialDir + "/bin/podman-rootful",
)
framework.ExpectNoError(err)

_, err = wrapper.WriteString("#!/bin/sh\nsudo podman \"$@\"\n")
if err != nil {
_ = wrapper.Close()
framework.ExpectNoError(err)
}

err = wrapper.Close()
framework.ExpectNoError(err)

// #nosec G302 -- wrapper script needs execute permission
err = os.Chmod(initialDir+"/bin/podman-rootful", 0o755)
framework.ExpectNoError(err)

cmd := exec.CommandContext( //nolint:gosec // G204: test-controlled path
ctx, initialDir+"/bin/podman-rootful", "ps",
)
docker.PrepareForGroupCancellation(cmd)
out, err := cmd.CombinedOutput()
framework.ExpectNoError(err, string(out))

ginkgo.DeferCleanup(func() {
_ = os.Remove(initialDir + "/bin/podman-rootful")
})

f, err = setupDockerProvider(
initialDir+"/bin",
initialDir+"/bin/podman-rootful",
)
framework.ExpectNoError(err)
},
)

ginkgo.Context("lifecycle commands", func() { //nolint:dupl
ginkgo.It(
"should run postAttachCommand on every attach",
func(ctx context.Context) {
tempDir, err := setupWorkspace(
"tests/up/testdata/docker-post-attach-every-time",
initialDir,
f,
)
framework.ExpectNoError(err)

err = f.DevsyUp(ctx, tempDir)
framework.ExpectNoError(err)

gomega.Eventually(func() string {
out, err := f.DevsySSH(
ctx, tempDir, "cat $HOME/attach-count.out 2>/dev/null",
)
if err != nil {
return ""
}
return strings.TrimSpace(out)
}).WithTimeout(15 * time.Second).WithPolling(1 * time.Second).Should(
gomega.Equal("1"),
)

err = f.DevsyUp(ctx, tempDir)
framework.ExpectNoError(err)

gomega.Eventually(func() string {
out, err := f.DevsySSH(
ctx, tempDir, "cat $HOME/attach-count.out 2>/dev/null",
)
if err != nil {
return ""
}
return strings.TrimSpace(out)
}).WithTimeout(15 * time.Second).WithPolling(1 * time.Second).Should(
gomega.Equal("2"),
)
},
ginkgo.SpecTimeout(
framework.TimeoutModerate(),
),
)

ginkgo.It(
"should run initializeCommand with object syntax",
func(ctx context.Context) {
tempDir, err := setupWorkspaceAndUp(
ctx,
"tests/up/testdata/docker-initcmd-parallel",
initialDir,
f,
)
framework.ExpectNoError(err)

one, err := os.ReadFile( //nolint:gosec // G304
filepath.Join(tempDir, "init-cmd-one.out"),
)
framework.ExpectNoError(err)
gomega.Expect(string(one)).To(gomega.Equal("initCmdOne"))

two, err := os.ReadFile( //nolint:gosec // G304
filepath.Join(tempDir, "init-cmd-two.out"),
)
framework.ExpectNoError(err)
gomega.Expect(string(two)).To(gomega.Equal("initCmdTwo"))
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
)

ginkgo.It( //nolint:dupl // mirrors rootless lifecycle secrets-file test
"should inject secrets-file env into lifecycle commands",
func(ctx context.Context) {
tempDir, err := setupWorkspace(
"tests/up/testdata/docker-secrets-file",
initialDir,
f,
)
framework.ExpectNoError(err)

secretsDir, err := framework.CreateTempDir()
framework.ExpectNoError(err)
ginkgo.DeferCleanup(func() { _ = os.RemoveAll(secretsDir) })

secretsFile := filepath.Join(secretsDir, "secrets.json")
err = os.WriteFile(
secretsFile,
[]byte(
`{"MY_SECRET":"test-value-12345","ANOTHER_SECRET":"second-secret-42"}`,
),
0o600,
)
framework.ExpectNoError(err)

err = f.DevsyUp(ctx, tempDir, "--secrets-file", secretsFile)
framework.ExpectNoError(err)

out, err := f.DevsySSH(ctx, tempDir, "cat /tmp/secret-check.out")
framework.ExpectNoError(err)
gomega.Expect(strings.TrimSpace(out)).
To(gomega.Equal("test-value-12345"))

out, err = f.DevsySSH(
ctx, tempDir, "cat /tmp/another-secret-check.out",
)
framework.ExpectNoError(err)
gomega.Expect(strings.TrimSpace(out)).
To(gomega.Equal("second-secret-42"))
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
)
})
})
},
)
Loading
Loading