Fix backup tests

Signed-off-by: Matt Lord <[email protected]>
vitessio · Jan 3, 2025 · 88e91a3 · 88e91a3
1 parent 8f66a9f
commit 88e91a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/go/test/endtoend/cluster/vtbackup_process.go b/go/test/endtoend/cluster/vtbackup_process.go
@@ -28,6 +28,8 @@ import (
 	"vitess.io/vitess/go/vt/log"
 )
 
+var fileBackupStorageRoot string = path.Join(os.Getenv("VTDATAROOT"), "/backups")
+
 // VtbackupProcess is a generic handle for a running Vtbackup.
 // It can be spawned manually
 type VtbackupProcess struct {
@@ -67,7 +69,7 @@ func (vtbackup *VtbackupProcess) Setup() (err error) {
 
 		//Backup Arguments are not optional
 		"--backup_storage_implementation", "file",
-		"--file_backup_storage_root", path.Join(os.Getenv("VTDATAROOT"), "tmp", "backupstorage"),
+		"--file_backup_storage_root", fileBackupStorageRoot,
 	)
 
 	if vtbackup.initialBackup {

diff --git a/go/test/endtoend/cluster/vtctld_process.go b/go/test/endtoend/cluster/vtctld_process.go
@@ -171,7 +171,7 @@ func VtctldProcessInstance(httpPort int, grpcPort int, topoPort int, hostname st
 		VtProcess:                   *base,
 		ServiceMap:                  "grpc-vtctl,grpc-vtctld",
 		BackupStorageImplementation: "file",
-		FileBackupStorageRoot:       path.Join(os.Getenv("VTDATAROOT"), "/backups"),
+		FileBackupStorageRoot:       fileBackupStorageRoot,
 		LogDir:                      tmpDirectory,
 		Port:                        httpPort,
 		GrpcPort:                    grpcPort,