Change finalization of elasticsearch distribution #64403
Merged
Conversation
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
breskeby
added
:Delivery/Build
breskeby
force-pushed
the
lazy-distribution-setup
branch
2 times, most recently
from
d8f5f87 to
08cb078
Compare
|
@elasticmachine test this please |
breskeby
force-pushed
the
lazy-distribution-setup
branch
2 times, most recently
from
b7675dc to
1f1b370
Compare
breskeby
commented
Nov 5, 2020
| @@ -75,6 +75,31 @@ class TestClustersPluginFuncTest extends AbstractGradleFuncTest { | |||
| assertNoCustomDistro('myCluster') | |||
| } | |||
|
|
|||
| def "can declare test cluster in lazy evaluated task configuration block"() { | |||
There was a problem hiding this comment.
One scenario we wanna support with this PR
breskeby
force-pushed
the
lazy-distribution-setup
branch
from
587c796 to
999d39c
Compare
|
@elasticsearchmachine test this please |
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
breskeby
force-pushed
the
lazy-distribution-setup
branch
from
c2a6997 to
d821451
Compare
mark-vieira
requested changes
Nov 9, 2020
buildSrc/src/integTest/groovy/org/elasticsearch/gradle/TestClustersPluginFuncTest.groovy
Show resolved
Hide resolved
|
|
||
| private Optional<TaskDependency> dockerBuildDependencies() { | ||
| // For non-required Docker distributions, skip building the distribution is Docker is unavailable | ||
| return (isDocker() && getFailIfUnavailable() == false && dockerSupport.get().getDockerAvailability().isAvailable == false) |
There was a problem hiding this comment.
This doesn't seem right. In both scenarios we return what is effectively an empty set of dependencies. If docker is available, or we don't consider this to be optional, we should return the configuration's build dependencies.
buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java
Show resolved
Hide resolved
| @@ -103,13 +105,16 @@ public String toString() { | |||
| private final Property<Boolean> bundledJdk; | |||
| private final Property<Boolean> failIfUnavailable; | |||
| private final Configuration extracted; | |||
| private Function<ElasticsearchDistribution, ElasticsearchDistribution> distributionFinalizer; | |||
There was a problem hiding this comment.
Couldn't this just be Action<Distribution>? I don't see where we ever actually use the returned result of this function.
buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java
Outdated
Show resolved
Hide resolved
|
@breskeby not sure why this PR is showing as having a bunch of unrelated changes. Did a merge go wrong? |
|
Probably a rebase. Let me check |
- avoid to rely on afterEvaluate lifecycle hook - allows us to define test cluster only in the task creation which can be later than afterevaluate
breskeby
force-pushed
the
lazy-distribution-setup
branch
from
7a8f58e to
bb199cf
Compare
|
@mark-vieira fixed |
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Nov 11, 2020
- Avoid to rely on afterEvaluate lifecycle hook in DistributionDownloadPlugin - Allows us to define test cluster only in the task creation which can be later than afterevaluate which allows us to move tasks that rely on test clusters using task avoidance api. - This should result in test clusters only being defined when actually used in the build - This unblocks further progress on elastic#56610
mark-vieira
added
Team:Delivery
breskeby
added a commit
that referenced
this pull request
Nov 12, 2020
- Avoid to rely on afterEvaluate lifecycle hook in DistributionDownloadPlugin - Allows us to define test cluster only in the task creation which can be later than afterevaluate which allows us to move tasks that rely on test clusters using task avoidance api. - This should result in test clusters only being defined when actually used in the build - This unblocks further progress on #56610
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
DistributionDownloadPlugin