Skip to content

Commit 78dbdeb

Browse files
committed
Fix :build-tools functional tests
1 parent e0104ea commit 78dbdeb

File tree

5 files changed

+19
-1
lines changed

5 files changed

+19
-1
lines changed

build-tools/src/integTest/groovy/org/elasticsearch/gradle/TestClustersPluginFuncTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import static org.elasticsearch.gradle.fixtures.DistributionDownloadFixture.with
2525
class TestClustersPluginFuncTest extends AbstractGradleFuncTest {
2626

2727
def setup() {
28+
// TestClusterPlugin with adding task listeners is not cc compatible
29+
configurationCacheCompatible = false
2830
buildFile << """
2931
import org.elasticsearch.gradle.testclusters.TestClustersAware
3032
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster

build-tools/src/integTest/groovy/org/elasticsearch/gradle/plugin/PluginBuildPluginFuncTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ import java.util.stream.Collectors
1818

1919
class PluginBuildPluginFuncTest extends AbstractGradleFuncTest {
2020

21+
def setup() {
22+
// underlaying TestClusterPlugin and StandaloneRestIntegTestTask are not cc compatible
23+
configurationCacheCompatible = false
24+
}
25+
2126
def "can assemble plugin via #taskName"() {
2227
given:
2328
buildFile << """plugins {

build-tools/src/integTest/groovy/org/elasticsearch/gradle/reaper/ReaperPluginFuncTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ class ReaperPluginFuncTest extends AbstractGradleFuncTest {
2323
import org.elasticsearch.gradle.ReaperPlugin;
2424
import org.elasticsearch.gradle.util.GradleUtils;
2525
26+
def serviceProvider = GradleUtils.getBuildService(project.getGradle().getSharedServices(), ReaperPlugin.REAPER_SERVICE_NAME);
27+
2628
tasks.register("launchReaper") {
2729
doLast {
28-
def serviceProvider = GradleUtils.getBuildService(project.getGradle().getSharedServices(), ReaperPlugin.REAPER_SERVICE_NAME);
2930
def reaper = serviceProvider.get()
3031
reaper.registerCommand('test', 'true')
3132
reaper.unregister('test')

build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/JavaRestTestPluginFuncTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ import org.gradle.testkit.runner.TaskOutcome
1414

1515
class JavaRestTestPluginFuncTest extends AbstractGradleFuncTest {
1616

17+
def setup() {
18+
// underlaying TestClusterPlugin and StandaloneRestIntegTestTask are not cc compatible
19+
configurationCacheCompatible = false
20+
}
21+
1722
def "declares default dependencies"() {
1823
given:
1924
buildFile << """

build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/YamlRestTestPluginFuncTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ import org.gradle.testkit.runner.TaskOutcome
1414

1515
class YamlRestTestPluginFuncTest extends AbstractGradleFuncTest {
1616

17+
def setup() {
18+
// underlaying TestClusterPlugin and StandaloneRestIntegTestTask are not cc compatible
19+
configurationCacheCompatible = false
20+
}
21+
1722
def "declares default dependencies"() {
1823
given:
1924
buildFile << """

0 commit comments

Comments
 (0)