Skip to content

Commit dc8857d

Browse files
authored
Skip ComposeBuild tasks when docker compose not available (#95320) (#95572)
The new gradle docker compose plugin introduced a new task type that we need to take into account in our TestFixturesPlugin
1 parent 3c77f00 commit dc8857d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.avast.gradle.dockercompose.ComposeExtension;
1111
import com.avast.gradle.dockercompose.DockerComposePlugin;
1212
import com.avast.gradle.dockercompose.ServiceInfo;
13+
import com.avast.gradle.dockercompose.tasks.ComposeBuild;
1314
import com.avast.gradle.dockercompose.tasks.ComposeDown;
1415
import com.avast.gradle.dockercompose.tasks.ComposePull;
1516
import com.avast.gradle.dockercompose.tasks.ComposeUp;
@@ -156,6 +157,7 @@ public void execute(Task task) {
156157
maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.internal.test.RestIntegTestTask"));
157158
maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.internal.test.AntFixture"));
158159
maybeSkipTasks(tasks, dockerSupport, ComposeUp.class);
160+
maybeSkipTasks(tasks, dockerSupport, ComposeBuild.class);
159161
maybeSkipTasks(tasks, dockerSupport, ComposePull.class);
160162
maybeSkipTasks(tasks, dockerSupport, ComposeDown.class);
161163

0 commit comments

Comments
 (0)