From 6444989e438f1164818bfbdfc77c066b4b64fe5c Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Tue, 7 Jan 2025 21:36:43 +0100
Subject: [PATCH] More cleanup

---
 qa/mixed-cluster/build.gradle                   | 2 +-
 x-pack/plugin/ccr/qa/multi-cluster/build.gradle | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle
index 32d684779601a..0889837457285 100644
--- a/qa/mixed-cluster/build.gradle
+++ b/qa/mixed-cluster/build.gradle
@@ -82,7 +82,7 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
     def baseCluster = testClusters.register(baseName) {
       versions = [bwcVersion.toString(), project.version]
       numberOfNodes = 4
-      setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
+      setting 'path.repo', "${layout.buildDirectory.asFile.get()}/cluster/shared/repo/${baseName}"
       setting 'xpack.security.enabled', 'false'
       setting "xpack.license.self_generated.type", "trial"
       /* There is a chance we have more master changes than "normal", so to avoid this test from failing,
diff --git a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
index e8a78e3514e7a..d5bc9395fc9c0 100644
--- a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
+++ b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle
@@ -29,7 +29,7 @@ def leaderCluster = testClusters.register('leader-cluster') {
   setting 'xpack.license.self_generated.type', 'trial'
   setting 'xpack.security.enabled', 'true'
   user username: 'admin', password: 'admin-password', role: 'superuser'
-  setting 'path.repo', "${buildDir}/cluster/shared/repo/leader-cluster"
+  setting 'path.repo', "${layout.buildDirectory.asFile.get()}/cluster/shared/repo/leader-cluster"
 }
 
 def middleCluster = testClusters.register('middle-cluster') {
@@ -55,14 +55,14 @@ def middleCluster = testClusters.register('middle-cluster') {
 tasks.register("leader-cluster", RestIntegTestTask) {
   mustRunAfter("precommit")
   systemProperty 'tests.target_cluster', 'leader'
-  systemProperty 'tests.leader_cluster_repository_path', "${buildDir}/cluster/shared/repo/leader-cluster"
+  systemProperty 'tests.leader_cluster_repository_path', "${layout.buildDirectory.asFile.get()}/cluster/shared/repo/leader-cluster"
 }
 
 tasks.register("middle-cluster", RestIntegTestTask) {
   dependsOn "leader-cluster"
   useCluster testClusters.named("leader-cluster")
   systemProperty 'tests.target_cluster', 'middle'
-  systemProperty 'tests.leader_cluster_repository_path', "${buildDir}/cluster/shared/repo/leader-cluster"
+  systemProperty 'tests.leader_cluster_repository_path', "${layout.buildDirectory.asFile.get()}/cluster/shared/repo/leader-cluster"
 
   def leaderUri = getClusterInfo('leader-cluster').map { it.allHttpSocketURI.get(0) }
   nonInputProperties.systemProperty 'tests.leader_host', leaderUri
@@ -73,7 +73,7 @@ tasks.register('follow-cluster', RestIntegTestTask) {
   useCluster leaderCluster
   useCluster middleCluster
   systemProperty 'tests.target_cluster', 'follow'
-  systemProperty 'tests.leader_cluster_repository_path', "${buildDir}/cluster/shared/repo/leader-cluster"
+  systemProperty 'tests.leader_cluster_repository_path', "${layout.buildDirectory.asFile.get()}/cluster/shared/repo/leader-cluster"
 
   def leaderUri = getClusterInfo('leader-cluster').map { it.allHttpSocketURI.get(0) }
   def middleUri = getClusterInfo('middle-cluster').map { it.allHttpSocketURI.get(0) }