Skip to content

Commit 342e1ac

Browse files
committed
Make pullFixture a task dependency of resolveAllDependencies (#38956)
* Make pullFixture a task dependency of resolveAllDependencies With this change we will pull the docker test fixtures ( and thus cache the images ) for older versions too as the `resolveAllDependencies` is already being called on the bwc checkouts too.
1 parent 8a716ac commit 342e1ac

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.ci/packer_cache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA}
2121
export JAVA8_HOME="${HOME}"/.java/java8
2222
export JAVA11_HOME="${HOME}"/.java/java11
2323
export JAVA12_HOME="${HOME}"/.java/java12
24-
./gradlew --parallel clean pullFixture --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
24+
./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,9 +614,10 @@ if (System.properties.get("build.compare") != null) {
614614

615615
allprojects {
616616
task resolveAllDependencies {
617-
doLast {
618-
configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
619-
}
617+
dependsOn tasks.matching { it.name == "pullFixture"}
618+
doLast {
619+
configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
620+
}
620621
}
621622
}
622623

0 commit comments

Comments
 (0)