Prepare ProjectBaseDir. (#8084)

Author: mbobrovskyi

test/integration/framework/framework.go

@@ -84,7 +84,7 @@ func (f *Framework) Init() *rest.Config {
 
 	var cfg *rest.Config
 	ginkgo.By("bootstrapping test environment", func() {
-		baseCrdPath := filepath.Join(util.GetProjectBaseDir(), "config", "components", "crd", "_output")
+		baseCrdPath := filepath.Join(util.ProjectBaseDir, "config", "components", "crd", "_output")
 		f.testEnv = &envtest.Environment{
 			CRDDirectoryPaths:     append(f.DepCRDPaths, baseCrdPath),
 			ErrorIfCRDPathMissing: true,

test/util/constants.go

@@ -58,16 +58,17 @@ var (
 )
 
 var (
-	AutoscalerCrds           = filepath.Join(GetProjectBaseDir(), "dep-crds", "cluster-autoscaler")
-	JobsetCrds               = filepath.Join(GetProjectBaseDir(), "dep-crds", "jobset-operator")
-	TrainingOperatorCrds     = filepath.Join(GetProjectBaseDir(), "dep-crds", "training-operator-crds")
-	KfTrainerCrds            = filepath.Join(GetProjectBaseDir(), "dep-crds", "kf-trainer-crds")
-	KfTrainerClusterRuntimes = filepath.Join(GetProjectBaseDir(), "dep-crds", "kf-trainer-runtimes")
-	MpiOperatorCrds          = filepath.Join(GetProjectBaseDir(), "dep-crds", "mpi-operator")
-	AppWrapperCrds           = filepath.Join(GetProjectBaseDir(), "dep-crds", "appwrapper-crds")
-	RayOperatorCrds          = filepath.Join(GetProjectBaseDir(), "dep-crds", "ray-operator-crds")
-	WebhookPath              = filepath.Join(GetProjectBaseDir(), "config", "components", "webhook")
-	ClusterProfileCrds       = filepath.Join(GetProjectBaseDir(), "dep-crds", "clusterprofile")
+	ProjectBaseDir           = getProjectBaseDir()
+	AutoscalerCrds           = filepath.Join(ProjectBaseDir, "dep-crds", "cluster-autoscaler")
+	JobsetCrds               = filepath.Join(ProjectBaseDir, "dep-crds", "jobset-operator")
+	TrainingOperatorCrds     = filepath.Join(ProjectBaseDir, "dep-crds", "training-operator-crds")
+	KfTrainerCrds            = filepath.Join(ProjectBaseDir, "dep-crds", "kf-trainer-crds")
+	KfTrainerClusterRuntimes = filepath.Join(ProjectBaseDir, "dep-crds", "kf-trainer-runtimes")
+	MpiOperatorCrds          = filepath.Join(ProjectBaseDir, "dep-crds", "mpi-operator")
+	AppWrapperCrds           = filepath.Join(ProjectBaseDir, "dep-crds", "appwrapper-crds")
+	RayOperatorCrds          = filepath.Join(ProjectBaseDir, "dep-crds", "ray-operator-crds")
+	WebhookPath              = filepath.Join(ProjectBaseDir, "config", "components", "webhook")
+	ClusterProfileCrds       = filepath.Join(ProjectBaseDir, "dep-crds", "clusterprofile")
 )
 
 var (

test/util/e2e.go

@@ -86,7 +86,7 @@ func GetAgnHostImage() string {
 		return image
 	}
 
-	agnhostDockerfilePath := filepath.Join(GetProjectBaseDir(), "hack", "agnhost", "Dockerfile")
+	agnhostDockerfilePath := filepath.Join(ProjectBaseDir, "hack", "agnhost", "Dockerfile")
 	agnhostImage, err := getDockerImageFromDockerfile(agnhostDockerfilePath)
 	if err != nil {
 		panic(fmt.Errorf("failed to get agnhost image: %v", err))

test/util/util.go

@@ -1182,18 +1182,17 @@ func KExecute(ctx context.Context, cfg *rest.Config, client *rest.RESTClient, ns
 	return out.Bytes(), outErr.Bytes(), nil
 }
 
-// GetProjectBaseDir retrieves the project base directory either from an environment variable or by searching for a Makefile.
+// getProjectBaseDir retrieves the project base directory either from an environment variable or by searching for a Makefile.
 // The fallback to the search is useful for running in IDEs like vs-code which don't set the PROJECT_DIR env. variable by default.
-func GetProjectBaseDir() string {
+func getProjectBaseDir() string {
 	projectBasePath, found := os.LookupEnv("PROJECT_DIR")
 	if found {
 		return filepath.Dir(projectBasePath)
 	}
 
 	projectBaseDir, err := findMakefileDir()
 	if err != nil {
-		klog.Error(err)
-		return ""
+		ginkgo.Fail(fmt.Sprintf("Failed to find project base directory: %v", err))
 	}
 	return projectBaseDir
 }