Disable build cache for packaging tests (elastic#51717)

henningandersen · Jan 31, 2020 · 378b27b · 378b27b
1 parent 336a395
commit 378b27b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java
@@ -46,6 +46,7 @@
 import org.gradle.api.plugins.ExtraPropertiesExtension;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.Copy;
 import org.gradle.api.tasks.TaskInputs;
 import org.gradle.api.tasks.TaskProvider;
@@ -325,6 +326,7 @@ private static TaskProvider<GradleDistroTestTask> configureVMWrapperTask(
 
     private static TaskProvider<?> configureDistroTest(Project project, ElasticsearchDistribution distribution) {
         return project.getTasks().register(destructiveDistroTestTaskName(distribution), Test.class, t -> {
+            t.getOutputs().doNotCacheIf("Build cache is disabled for packaging tests", Specs.satisfyAll());
             t.setMaxParallelForks(1);
             t.setWorkingDir(project.getProjectDir());
             t.systemProperty(DISTRIBUTION_SYSPROP, distribution.toString());

diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle
@@ -137,6 +137,7 @@ processTestResources {
 }
 
 task integTest(type: Test) {
+  outputs.doNotCacheIf('Build cache is disabled for Docker tests') { true }
   maxParallelForks = '1'
   include '**/*IT.class'
   // don't add the tasks to build the docker images if we have no way of testing them