Repository navigation
Split Akka HTTP and Spring WebFlux tests across CI shards #12848
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -183,3 +183,32 @@ tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) { | |||||||||||||||||
| tasks.named("compileLatestDepTestGroovy", GroovyCompile) { | ||||||||||||||||||
| classpath += files(tasks.named('compileLatestDepTestScala').map { it.destinationDirectory }) | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| // Split the large Akka HTTP project into independently scheduled CI units. Existing test tasks | ||||||||||||||||||
| // remain unchanged for local builds; only sharded CI delegates them through virtual projects. | ||||||||||||||||||
| if (rootProject.providers.gradleProperty("slot").isPresent()) { | ||||||||||||||||||
| tasks.named("allTests") { | ||||||||||||||||||
| setDependsOn([]) | ||||||||||||||||||
| } | ||||||||||||||||||
|
Comment on lines
+189
to
+192
Contributor
There was a problem hiding this comment. issue: This kinda break the model of declaring aggregating tasks. I.e. clearing these dependencies replaces automatic suite discovery with a fixed list. A newly added suite can therefore run locally but be omitted from sharded CI until this list is updated. I understand this happens only when there's a The WebFlux split has the same issue. |
||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| def ciAkkaTestShards = [ | ||||||||||||||||||
| 'akka-http-base-tests': [tasks.named('baseTest'), tasks.named('lagomTest')], | ||||||||||||||||||
| 'akka-http-base-forked-tests': [tasks.named('baseTestForkedTest'), tasks.named('iastTest')], | ||||||||||||||||||
| 'akka-http-version-101-tests': [tasks.named('version101Test'), tasks.named('version101IastTest')], | ||||||||||||||||||
| 'akka-http-version-101-forked-tests': [tasks.named('version101ForkedTest'), tasks.named('version102IastTest')], | ||||||||||||||||||
| 'akka-http-version-102-tests': [tasks.named('version102Scala213Test')], | ||||||||||||||||||
| ] | ||||||||||||||||||
|
|
||||||||||||||||||
| def ciShardProjectPaths = rootProject.extensions.extraProperties.get('ciShardProjectPaths') as Map | ||||||||||||||||||
|
Contributor
There was a problem hiding this comment. issue: While Gradle support storing objects there, using extra properties is most likely the wrong approach, which is presently the case. Possibly I would rather go toward a build service. In this case there is two concrete problems
|
||||||||||||||||||
| ciAkkaTestShards.each { childName, testTasks -> | ||||||||||||||||||
| def childPath = ":dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0:$childName" | ||||||||||||||||||
| testTasks.each { testTask -> | ||||||||||||||||||
| ciShardProjectPaths[testTask.get().path] = childPath | ||||||||||||||||||
|
Contributor
There was a problem hiding this comment. issue: This reealizes a test task early breaking the Gradle's task configuration best practices. This loop runs during every build configuration, including unrelated invocations like
Suggested change
|
||||||||||||||||||
| } | ||||||||||||||||||
| project(childPath) { | ||||||||||||||||||
| tasks.register("allTests") { | ||||||||||||||||||
| dependsOn(testTasks) | ||||||||||||||||||
| } | ||||||||||||||||||
|
Comment on lines
+210
to
+212
Contributor
There was a problem hiding this comment. suggestion (non-blocking): Could we give the new child aggregates a verification group and a description? The 32 child
Suggested change
|
||||||||||||||||||
| } | ||||||||||||||||||
| } | ||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| // CI-only virtual project; its allTests task is registered by the parent project. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion (non-blocking): I'm really not keep on having virtual projects, but if we go this way, could we use
build.gradle.ktsfor the new child build files if these scheduling projects remain?Also for all the other 32 comment-only build files, so there is no Groovy logic to migrate in them. This follows Gradle's recommendation for new build scripts; the existing module scripts can remain as they are.
Gradle's Kotlin DSL guidance.