Fix docker packaging tests (#65199) (#65218)

elastic · Nov 18, 2020 · f914143 · f914143
1 parent f4af82c
commit f914143
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java b/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java
@@ -319,8 +319,12 @@ void finalizeValues() {
         bundledJdk.finalizeValue();
     }
 
-    public Configuration getArchive() {
-        maybeFreeze();
-        return configuration;
+    public TaskDependency getArchiveDependencies() {
+        if (skippingDockerDistributionBuild()) {
+            return task -> Collections.emptySet();
+        } else {
+            maybeFreeze();
+            return configuration.getBuildDependencies();
+        }
     }
 }
diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java
@@ -114,7 +114,7 @@ public void apply(Project project) {
             String taskname = destructiveDistroTestTaskName(distribution);
             TaskProvider<?> depsTask = project.getTasks().register(taskname + "#deps");
             // explicitly depend on the archive not on the implicit extracted distribution
-            depsTask.configure(t -> t.dependsOn(distribution.getArchive(), examplePlugin, quotaAwareFsPlugin));
+            depsTask.configure(t -> t.dependsOn(distribution.getArchiveDependencies(), examplePlugin, quotaAwareFsPlugin));
             depsTasks.put(taskname, depsTask);
             TaskProvider<Test> destructiveTask = configureTestTask(project, taskname, distribution, t -> {
                 t.onlyIf(t2 -> distribution.isDocker() == false || dockerSupport.get().getDockerAvailability().isAvailable);