Skip to content

Commit 313a84a

Browse files
authored
[7.17] Fix task dependency setup for packaging tests (#123994)
1 parent de96829 commit 313a84a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,10 @@ private static void configureVMWrapperTasks(
336336
t.setDescription("Runs " + destructiveTaskName.split("\\.", 2)[1] + " tests within vagrant");
337337
t.setTaskName(destructiveTaskName);
338338
t.extraArg("-D'" + IN_VM_SYSPROP + "'");
339-
t.dependsOn(depsTasks.get(destructiveTaskName));
340-
t.dependsOn(additionalDeps);
339+
TaskProvider<?> taskDependencies = depsTasks.get(destructiveTaskName);
340+
if (taskDependencies != null) {
341+
t.dependsOn(taskDependencies);
342+
}
341343
t.setLogLevel(project.getGradle().getStartParameter().getLogLevel().toString());
342344
t.setExtension(project.getExtensions().findByType(VagrantExtension.class));
343345
t.setService(project.getExtensions().getByType(VagrantMachine.class));

0 commit comments

Comments
 (0)