ci: minor e2e test improvements (#1687)

Signed-off-by: ayush-panta <ayushkp@amazon.com>

Author: ayush-panta

Makefile

@@ -333,6 +333,7 @@ test-e2e-daemon:
 	-@$(OUTDIR)/bin/$(BINARYNAME) vm stop -f || true
 	-@$(OUTDIR)/bin/$(BINARYNAME) vm remove -f
 	-@$(OUTDIR)/bin/$(BINARYNAME) vm init
+	@echo '{}' > $(HOME)/.finch/config.json
 
 	cd $(FINCH_CORE_DIR)/src/finch-daemon && \
 	STATIC=1 GOOS=linux GOARCH=$(GOARCH) make && \

e2e/container/container_test.go

@@ -6,7 +6,9 @@ package container
 
 import (
 	"fmt"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"regexp"
 	"runtime"
 	"testing"
@@ -31,6 +33,20 @@ func TestContainer(t *testing.T) {
 	}
 
 	ginkgo.SynchronizedBeforeSuite(func() []byte {
+		// Set DOCKER_CONFIG to /.finch
+		var finchConfigDir string
+		if runtime.GOOS == "windows" {
+			finchConfigDir = filepath.Join(os.Getenv("LOCALAPPDATA"), ".finch")
+		} else {
+			homeDir, _ := os.UserHomeDir()
+			finchConfigDir = filepath.Join(homeDir, ".finch")
+		}
+		_ = os.MkdirAll(finchConfigDir, 0o700)
+		o.UpdateEnv("DOCKER_CONFIG", finchConfigDir)
+		// Ensure empty /.finch/config.json
+		configPath := filepath.Join(finchConfigDir, "config.json")
+		_ = os.WriteFile(configPath, []byte("{}"), 0o644)
+
 		if runtime.GOOS != "linux" {
 			command.New(o, "vm", "stop", "-f").WithoutCheckingExitCode().WithTimeoutInSeconds(30).Run()
 			time.Sleep(1 * time.Second)

e2e/container/cosign_test.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
@@ -45,14 +46,25 @@ var testCosign = func(o *option.Option) {
 			htpasswdDir := filepath.Dir(ffs.CreateTempFile(filename, htpasswd))
 			ginkgo.DeferCleanup(os.RemoveAll, htpasswdDir)
 			port = fnet.GetFreePort()
-			command.Run(o, "run",
+			containerID := command.StdoutStr(o, "run",
 				"-dp", fmt.Sprintf("%d:5000", port),
 				"--name", "registry",
 				"-v", fmt.Sprintf("%s:/auth", htpasswdDir),
 				"-e", "REGISTRY_AUTH=htpasswd",
 				"-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
 				"-e", fmt.Sprintf("REGISTRY_AUTH_HTPASSWD_PATH=/auth/%s", filename),
 				registryImage)
+			// Wait for container to be running
+			tries := 0
+			for command.StdoutStr(o, "inspect", "-f", "{{.State.Running}}", containerID) != "true" {
+				if tries >= 5 {
+					ginkgo.Fail("Registry container failed to start after 5 seconds")
+				}
+				time.Sleep(1 * time.Second)
+				tries++
+			}
+			// Wait for registry service to be ready
+			time.Sleep(10 * time.Second)
 			registry = fmt.Sprintf(`localhost:%d`, port)
 			tag = fmt.Sprintf(`%s/test-login:tag`, registry)
 		})

e2e/vm/finch_config_file_remote_test.go

@@ -49,8 +49,13 @@ var testFinchConfigFile = func(o *option.Option) {
 				registryImage)
 			ginkgo.DeferCleanup(command.Run, o, "rmi", "-f", registryImage)
 			ginkgo.DeferCleanup(command.Run, o, "rm", "-f", registryContainer)
+			tries := 0
 			for command.StdoutStr(o, "inspect", "-f", "{{.State.Running}}", containerID) != "true" {
+				if tries >= 5 {
+					ginkgo.Fail("Registry container failed to start after 5 seconds")
+				}
 				time.Sleep(1 * time.Second)
+				tries++
 			}
 			time.Sleep(10 * time.Second)
 			registry := fmt.Sprintf(`localhost:%d`, port)

e2e/vm/vm_darwin_test.go

@@ -37,6 +37,16 @@ func TestVM(t *testing.T) {
 	// Test Stopped -> Nonexistent
 	// Test Nonexistent -> Running
 	ginkgo.SynchronizedBeforeSuite(func() []byte {
+		// Set DOCKER_CONFIG to /.finch
+		homeDir, err := os.UserHomeDir()
+		gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
+		finchConfigDir := filepath.Join(homeDir, ".finch")
+		_ = os.MkdirAll(finchConfigDir, 0o700)
+		o.UpdateEnv("DOCKER_CONFIG", finchConfigDir)
+		// Ensure empty /.finch/config.json
+		configPath := filepath.Join(finchConfigDir, "config.json")
+		_ = os.WriteFile(configPath, []byte("{}"), 0o644)
+
 		resetDisks(o, *e2e.Installed)
 		command.New(o, "vm", "stop", "-f").WithoutCheckingExitCode().WithTimeoutInSeconds(30).Run()
 		time.Sleep(1 * time.Second)

e2e/vm/vm_windows_test.go

@@ -37,6 +37,15 @@ func TestVM(t *testing.T) {
 	// Test Stopped -> Nonexistent
 	// Test Nonexistent -> Running
 	ginkgo.SynchronizedBeforeSuite(func() []byte {
+		// Ensure DOCKER_CONFIG is set to %LOCALAPPDATA%\.finch
+		finchRootDir := os.Getenv("LOCALAPPDATA")
+		finchConfigDir := filepath.Join(finchRootDir, ".finch")
+		_ = os.MkdirAll(finchConfigDir, 0o700)
+		o.UpdateEnv("DOCKER_CONFIG", finchConfigDir)
+		// Ensure empty /.finch/config.json
+		configPath := filepath.Join(finchConfigDir, "config.json")
+		_ = os.WriteFile(configPath, []byte("{}"), 0o644)
+
 		resetDisks(o, *e2e.Installed)
 		command.New(o, "vm", "stop", "-f").WithoutCheckingExitCode().WithTimeoutInSeconds(30).Run()
 		time.Sleep(1 * time.Second)