From 818d8951b85e76c44d8b9a0b391c2f1144a2abb8 Mon Sep 17 00:00:00 2001
From: Alpar Torok <torokalpar@gmail.com>
Date: Mon, 18 Feb 2019 14:10:10 +0200
Subject: [PATCH] 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.
---
 .ci/packer_cache.sh | 2 +-
 build.gradle        | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
index ce78ebcc1ca..04511f81281 100755
--- a/.ci/packer_cache.sh
+++ b/.ci/packer_cache.sh
@@ -21,4 +21,4 @@ export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA}
 export JAVA8_HOME="${HOME}"/.java/java8
 export JAVA11_HOME="${HOME}"/.java/java11
 export JAVA12_HOME="${HOME}"/.java/java12
-./gradlew --parallel  clean pullFixture  --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
+./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
diff --git a/build.gradle b/build.gradle
index 82ba357b91a..ca4c2cd5cae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -614,9 +614,10 @@ if (System.properties.get("build.compare") != null) {
 
 allprojects {
   task resolveAllDependencies {
-    doLast {
-      configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
-    }
+      dependsOn tasks.matching { it.name == "pullFixture"}
+      doLast {
+        configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
+      }
   }
 }