diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 69d9af298..721c40a67 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -406,11 +406,16 @@ func (h *CephInstaller) GetRookExternalClusterMonSecret(namespace string) (*v1.S } func (h *CephInstaller) initTestDir(namespace string) (string, error) { - h.hostPathToDelete = path.Join(baseTestDir(), "rook-test") + val, err := baseTestDir() + if err != nil { + return "", err + } + + h.hostPathToDelete = path.Join(val, "rook-test") testDir := path.Join(h.hostPathToDelete, namespace) // skip the test dir creation if we are not running under "/data" - if baseTestDir() != "/data" { + if val != "/data" { // Create the test dir on the local host if err := os.MkdirAll(testDir, 0777); err != nil { return "", err diff --git a/tests/framework/installer/environment.go b/tests/framework/installer/environment.go index 83b9c0971..a11fc5443 100644 --- a/tests/framework/installer/environment.go +++ b/tests/framework/installer/environment.go @@ -50,13 +50,18 @@ func UsePVC() bool { } // baseTestDir gets the base test directory -func baseTestDir() string { - // If the base test directory is actively set to empty (as in CI), we use the current working directory. +func baseTestDir() (string, error) { + // If the base test directory is actively set to WORKING_DIR (as in CI), + // we use the current working directory. val := getEnvVarWithDefault("TEST_BASE_DIR", "/data") if val == "WORKING_DIR" { - val, _ = os.Getwd() + var err error + val, err = os.Getwd() + if err != nil { + return "", err + } } - return val + return val, nil } // TestScratchDevice get the scratch device to be used for OSD