Fix IP issues in PerformanceTestPlugin

gradle · May 23, 2024 · ae0e9c8 · ae0e9c8
1 parent 6451844
commit ae0e9c8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/...tings/build-environment/src/main/kotlin/gradlebuild.build-environment.settings.gradle.kts b/...tings/build-environment/src/main/kotlin/gradlebuild.build-environment.settings.gradle.kts
@@ -25,6 +25,7 @@ with(layout.rootDirectory) {
                 "BuildEnvironmentService should be registered by the root"
             }
             parameters.rootProjectDir = this@with
+            parameters.rootProjectBuildDir = project.layout.buildDirectory
             parameters.artifactoryUserName = providers.gradleProperty("artifactoryUserName")
             parameters.artifactoryPassword = providers.gradleProperty("artifactoryPassword")
             parameters.testVersions = providers.gradleProperty("testVersions")
@@ -37,6 +38,7 @@ with(layout.rootDirectory) {
         buildEnvironmentExtension.gitCommitId = service.flatMap { it.gitCommitId }
         buildEnvironmentExtension.gitBranch = service.flatMap { it.gitBranch }
         buildEnvironmentExtension.repoRoot = this@with
+        buildEnvironmentExtension.rootProjectBuildDir = service.flatMap { it.parameters.rootProjectBuildDir }
         buildEnvironmentExtension.artifactoryUserName = service.flatMap { it.parameters.artifactoryUserName }
         buildEnvironmentExtension.artifactoryPassword = service.flatMap { it.parameters.artifactoryPassword }
         buildEnvironmentExtension.testVersions = service.flatMap { it.parameters.testVersions }

diff --git a/...ettings/build-environment/src/main/kotlin/gradlebuild/basics/BuildEnvironmentExtension.kt b/...ettings/build-environment/src/main/kotlin/gradlebuild/basics/BuildEnvironmentExtension.kt
@@ -24,6 +24,7 @@ interface BuildEnvironmentExtension {
     val gitCommitId: Property<String>
     val gitBranch: Property<String>
     val repoRoot: DirectoryProperty
+    val rootProjectBuildDir: DirectoryProperty
     val artifactoryUserName: Property<String>
     val artifactoryPassword: Property<String>
     val testVersions: Property<String>

diff --git a/...-settings/build-environment/src/main/kotlin/gradlebuild/basics/BuildEnvironmentService.kt b/...-settings/build-environment/src/main/kotlin/gradlebuild/basics/BuildEnvironmentService.kt
@@ -30,6 +30,7 @@ abstract class BuildEnvironmentService : BuildService<BuildEnvironmentService.Pa
 
     interface Parameters : BuildServiceParameters {
         val rootProjectDir: DirectoryProperty
+        val rootProjectBuildDir: DirectoryProperty
         val artifactoryUserName: Property<String>
         val artifactoryPassword: Property<String>
         val testVersions: Property<String>

diff --git a/...ogic/performance-testing/src/main/kotlin/gradlebuild/performance/PerformanceTestPlugin.kt b/...ogic/performance-testing/src/main/kotlin/gradlebuild/performance/PerformanceTestPlugin.kt
@@ -22,6 +22,7 @@ import gradlebuild.basics.buildBranch
 import gradlebuild.basics.buildCommitId
 import gradlebuild.basics.capitalize
 import gradlebuild.basics.defaultPerformanceBaselines
+import gradlebuild.basics.getBuildEnvironmentExtension
 import gradlebuild.basics.includePerformanceTestScenarios
 import gradlebuild.basics.logicalBranch
 import gradlebuild.basics.performanceBaselines
@@ -310,7 +311,7 @@ class PerformanceTestPlugin : Plugin<Project> {
         // determineBaselines.determinedBaselines -> buildCommitDistribution.baselines
         val determineBaselines = tasks.register("determineBaselines", DetermineBaselines::class, false)
         val buildCommitDistribution = tasks.register("buildCommitDistribution", BuildCommitDistribution::class)
-        val buildCommitDistributionsDir = project.rootProject.layout.buildDirectory.dir("commit-distributions")
+        val buildCommitDistributionsDir = project.getBuildEnvironmentExtension().rootProjectBuildDir.dir("commit-distributions")
 
         determineBaselines.configure {
             configuredBaselines = extension.baselines