fixup! fixup! fixup! fixup! fixup! fixes

Signed-off-by: Oleksii Kurinnyi <[email protected]>

Author: akurinnoy

test/e2e/pkg/tests/custom_init_container_tests.go

@@ -23,6 +23,7 @@ import (
 	"runtime"
 
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
+	"github.com/devfile/devworkspace-operator/pkg/constants"
 	"github.com/devfile/devworkspace-operator/test/e2e/pkg/config"
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
@@ -86,6 +87,36 @@ var _ = ginkgo.Describe("[Custom Init Container Tests]", func() {
 				return err
 			}, "10m", "5s").Should(gomega.Succeed())
 
+			// Wait for init container to complete and verify it succeeded
+			gomega.Eventually(func() error {
+				pod, err := config.AdminK8sClient.Kube().CoreV1().Pods(config.DevWorkspaceNamespace).Get(context.TODO(), podName, metav1.GetOptions{})
+				if err != nil {
+					return err
+				}
+				for _, status := range pod.Status.InitContainerStatuses {
+					if status.Name == constants.HomeInitComponentName {
+						if status.State.Terminated == nil {
+							return fmt.Errorf("init container %s still running", constants.HomeInitComponentName)
+						}
+						if status.State.Terminated.ExitCode != 0 {
+							// Get logs for debugging
+							logs, logErr := config.AdminK8sClient.GetLogsForContainer(podName, config.DevWorkspaceNamespace, constants.HomeInitComponentName)
+							logMsg := ""
+							if logErr == nil {
+								logMsg = fmt.Sprintf(" Logs: %s", logs)
+							}
+							return fmt.Errorf("init container %s failed with exit code %d: %s%s",
+								constants.HomeInitComponentName,
+								status.State.Terminated.ExitCode,
+								status.State.Terminated.Message,
+								logMsg)
+						}
+						return nil
+					}
+				}
+				return fmt.Errorf("init container %s status not found", constants.HomeInitComponentName)
+			}, "5m", "5s").Should(gomega.Succeed(), "Init container should complete successfully")
+
 			// Check that the custom init script ran by verifying the marker file exists
 			resultOfExecCommand, err := config.DevK8sClient.ExecCommandInContainer(podName, config.DevWorkspaceNamespace, "tooling", "test -f /home/user/.custom_init_complete && echo 'SUCCESS' || echo 'FAILED'")
 			if err != nil {