Skip to content

Commit f48bb02

Browse files
committed
[CI] Disable all external modules tests for non-snapshot builds
1 parent ff6465b commit f48bb02

File tree

8 files changed

+8
-19
lines changed

8 files changed

+8
-19
lines changed

test/external-modules/apm-integration/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ tasks.named("test").configure {
2424
enabled = false
2525
}
2626

27-
tasks.named('javaRestTest').configure {
28-
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
29-
}
30-
3127
dependencies {
3228
clusterModules project(':modules:apm')
3329
implementation project(':libs:logging')

test/external-modules/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ subprojects {
1515
licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
1616
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
1717
}
18+
19+
tasks.named { it == "javaRestTest" || it == "yamlRestTest" }.configureEach {
20+
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
21+
}
1822
}

test/external-modules/delayed-aggs/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99

1010
apply plugin: 'elasticsearch.legacy-yaml-rest-test'
1111

12-
tasks.named('yamlRestTest').configure {
13-
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
14-
}
15-
1612
esplugin {
1713
description = 'A test module that allows to delay aggregations on shards with a configurable time'
1814
classname ='org.elasticsearch.test.delayedshard.DelayedShardAggregationPlugin'

test/external-modules/die-with-dignity/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ GradleUtils.extendSourceSet(project, "main", "javaRestTest", tasks.named("javaRe
2323
tasks.named("test").configure {
2424
enabled = false
2525
}
26-
27-
tasks.named('javaRestTest').configure {
28-
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
29-
}

test/external-modules/error-query/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
1212

1313
tasks.named('javaRestTest') {
1414
usesDefaultDistribution()
15-
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
16-
}
17-
18-
tasks.named('yamlRestTest').configure {
19-
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
2015
}
2116

2217
esplugin {

test/external-modules/esql-heap-attack/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ esplugin {
2020

2121
tasks.named('javaRestTest') {
2222
usesDefaultDistribution()
23-
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
2423
}

test/external-modules/jvm-crash/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ esplugin {
2020

2121
tasks.named('javaRestTest') {
2222
usesDefaultDistribution()
23-
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
2423
}

test/external-modules/multi-project/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ dependencies {
1717
tasks.withType(StandaloneRestIntegTestTask).configureEach {
1818
usesDefaultDistribution()
1919
}
20+
21+
tasks.named("javaRestTest").configure {
22+
enabled = buildParams.snapshotBuild
23+
}

0 commit comments

Comments
 (0)