Merge #91804

91804: roachtest: use correct certs directory r=msbutler a=stevendanna I did a last minute refactor but only tested it on a local cluster. It seems Put on a directory works different locally vs remotely. Fixes #91791 Release note: None Co-authored-by: Steven Danna <[email protected]>
cockroachdb · Nov 13, 2022 · f82dead · f82dead
2 parents af18b5d + d479bad
commit f82dead
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/cmd/roachtest/tests/cluster_to_cluster.go b/pkg/cmd/roachtest/tests/cluster_to_cluster.go
@@ -268,13 +268,15 @@ func copyPGCertsAndMakeURL(
 
 	dir := "."
 	if c.IsLocal() {
-		dir = local.VMDir(c.Name(), destNode[0])
+		dir = filepath.Join(local.VMDir(c.Name(), destNode[0]), "src-cluster-certs")
+	} else {
+		dir = "./src-cluster-certs/certs"
 	}
 	options := pgURL.Query()
 	options.Set("sslmode", "verify-full")
-	options.Set("sslrootcert", filepath.Join(dir, "src-cluster-certs", "ca.crt"))
-	options.Set("sslcert", filepath.Join(dir, "src-cluster-certs", "client.root.crt"))
-	options.Set("sslkey", filepath.Join(dir, "src-cluster-certs", "client.root.key"))
+	options.Set("sslrootcert", filepath.Join(dir, "ca.crt"))
+	options.Set("sslcert", filepath.Join(dir, "client.root.crt"))
+	options.Set("sslkey", filepath.Join(dir, "client.root.key"))
 	pgURL.RawQuery = options.Encode()
 	return pgURL.String(), cleanup, err
 }