Skip to content
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.

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

rework the creation of home & config directories created for e2e tests #11226

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions pkg/e2e/framework.go
Expand Up @@ -94,13 +94,14 @@ func NewParallelCLI(t *testing.T, opts ...CLIOption) *CLI {
func NewCLI(t testing.TB, opts ...CLIOption) *CLI {
t.Helper()

configDir := t.TempDir()
homeDir := t.TempDir()
configDir := filepath.Join(homeDir, ".docker")
initializePlugins(t, configDir)
initializeContextDir(t, configDir)

c := &CLI{
ConfigDir: configDir,
HomeDir: t.TempDir(),
HomeDir: homeDir,
}

for _, opt := range opts {
Expand Down Expand Up @@ -155,14 +156,21 @@ func initializePlugins(t testing.TB, configDir string) {
}

func initializeContextDir(t testing.TB, configDir string) {
dockerUserDir := ".docker/contexts"
dockerUserDir := ".docker"
userDir, err := os.UserHomeDir()
require.NoError(t, err, "Failed to get user home directory")
userContextsDir := filepath.Join(userDir, dockerUserDir)
userDockerDir := filepath.Join(userDir, dockerUserDir)
userContextsDir := filepath.Join(userDockerDir, "contexts")
if checkExists(userContextsDir) {
dstContexts := filepath.Join(configDir, "contexts")
require.NoError(t, cp.Copy(userContextsDir, dstContexts), "Failed to copy contexts directory")
}
userConfigJson := filepath.Join(userDockerDir, "config.json")
if checkExists(userConfigJson) {
dstConfigJson := filepath.Join(configDir, "config.json")
require.NoError(t, cp.Copy(userConfigJson, dstConfigJson), "Failed to copy config.json file")
}

}

func checkExists(path string) bool {
Expand Down