#1276 Fixing the identification of builds based on commit ID

nemerosa · May 25, 2024 · 3bed25e · 3bed25e
1 parent 481d45b
commit 3bed25e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...sion-github/src/main/java/net/nemerosa/ontrack/extension/github/scm/GitHubSCMExtension.kt b/...sion-github/src/main/java/net/nemerosa/ontrack/extension/github/scm/GitHubSCMExtension.kt
@@ -235,8 +235,10 @@ class GitHubSCMExtension(
                 entityType = ProjectEntityType.BUILD,
                 propertyType = GitCommitPropertyType::class,
                 searchArguments = GitCommitPropertyType.getGitCommitSearchArguments(id)
-            ).firstOrNull()?.let { buildId ->
+            ).map { buildId ->
                 structureService.getBuild(buildId)
+            }.firstOrNull { build ->
+                build.project.id == project.id
             }
 
         private val client: OntrackGitHubClient by lazy {

diff --git a/...k-extension-scm/src/main/java/net/nemerosa/ontrack/extension/scm/mock/MockSCMExtension.kt b/...k-extension-scm/src/main/java/net/nemerosa/ontrack/extension/scm/mock/MockSCMExtension.kt
@@ -346,8 +346,10 @@ class MockSCMExtension(
                 entityType = ProjectEntityType.BUILD,
                 propertyType = MockSCMBuildCommitPropertyType::class,
                 searchArguments = MockSCMBuildCommitProperty.getSearchArguments(id)
-            ).firstOrNull()?.let { buildId ->
+            ).map { buildId ->
                 structureService.getBuild(buildId)
+            }.firstOrNull { build ->
+                build.project.id == project.id
             }
     }
 

diff --git a/...ash/src/main/java/net/nemerosa/ontrack/extension/stash/scm/BitbucketServerSCMExtension.kt b/...ash/src/main/java/net/nemerosa/ontrack/extension/stash/scm/BitbucketServerSCMExtension.kt
@@ -207,8 +207,10 @@ class BitbucketServerSCMExtension(
                 entityType = ProjectEntityType.BUILD,
                 propertyType = GitCommitPropertyType::class,
                 searchArguments = GitCommitPropertyType.getGitCommitSearchArguments(id)
-            ).firstOrNull()?.let { buildId ->
+            ).map { buildId ->
                 structureService.getBuild(buildId)
+            }.firstOrNull { build ->
+                build.project.id == project.id
             }
 
         private fun waitAndMerge(prId: Int, from: String, message: String): Boolean {