Skip to content

Commit 7888006

Browse files
moschemosche
committed
Expand bcUpgradeTask to run more test suites. Relates to ES-11904
1 parent f9fe613 commit 7888006

File tree

11 files changed

+75
-5
lines changed

11 files changed

+75
-5
lines changed

‎modules/ingest-geoip/qa/full-cluster-restart/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10+
import org.elasticsearch.gradle.Version
1011
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
1112

1213
apply plugin: 'elasticsearch.internal-java-rest-test'
@@ -24,3 +25,10 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
2425
systemProperty("tests.old_cluster_version", bwcVersion)
2526
}
2627
}
28+
29+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
30+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
31+
usesBwcDistribution(Version.fromString("0.0.0"))
32+
systemProperty("tests.old_cluster_version", "0.0.0")
33+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
34+
}

‎qa/full-cluster-restart/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ tasks.register("luceneBwcTest", StandaloneRestIntegTestTask) {
2828
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
2929
}
3030

31+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
32+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
33+
usesBwcDistribution(Version.fromString("0.0.0"))
34+
systemProperty("tests.old_cluster_version", "0.0.0")
35+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
36+
}
37+
3138
tasks.withType(Test).configureEach {
3239
// CI doesn't like it when there's multiple clusters running at once
3340
maxParallelForks = 1

‎qa/rolling-upgrade/build.gradle‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
3131
usesBwcDistribution(Version.fromString("0.0.0"))
3232
systemProperty("tests.old_cluster_version", "0.0.0")
3333
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
34-
filter {
35-
// filter tests initially for quicker iterations
36-
// TODO remove once expanding the test set to other modules
37-
includeTestsMatching("org.elasticsearch.upgrades.IndexingIT")
38-
}
3934
}
4035

4136
tasks.withType(Test).configureEach {

‎x-pack/plugin/downsample/qa/mixed-cluster/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* 2.0.
66
*/
77

8+
import org.elasticsearch.gradle.Version
89
import org.elasticsearch.gradle.VersionProperties
910
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
1011

@@ -43,6 +44,13 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN
4344
}
4445
}
4546

47+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
48+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
49+
usesBwcDistribution(Version.fromString("0.0.0"))
50+
systemProperty("tests.old_cluster_version", "0.0.0")
51+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
52+
}
53+
4654
tasks.named("yamlRestTest") {
4755
enabled = false
4856
}

‎x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* 2.0.
66
*/
77

8+
import org.elasticsearch.gradle.Version
89
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
910

1011
apply plugin: 'elasticsearch.internal-java-rest-test'
@@ -22,3 +23,10 @@ buildParams.bwcVersions.withWireCompatible(v -> v.after("8.8.0")) { bwcVersion,
2223
systemProperty("tests.old_cluster_version", bwcVersion)
2324
}
2425
}
26+
27+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
28+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
29+
usesBwcDistribution(Version.fromString("0.0.0"))
30+
systemProperty("tests.old_cluster_version", "0.0.0")
31+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
32+
}

‎x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN
6262
}
6363
}
6464

65+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
66+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
67+
usesBwcDistribution(Version.fromString("0.0.0"))
68+
systemProperty("tests.old_cluster_version", "0.0.0")
69+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
70+
}
71+
6572
tasks.named("yamlRestTest") {
6673
enabled = false
6774
}

‎x-pack/plugin/inference/qa/mixed-cluster/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN
3838
}
3939
}
4040

41+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
42+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
43+
usesBwcDistribution(Version.fromString("0.0.0"))
44+
systemProperty("tests.old_cluster_version", "0.0.0")
45+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
46+
}

‎x-pack/plugin/inference/qa/rolling-upgrade/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* 2.0.
66
*/
77

8+
import org.elasticsearch.gradle.Version
89
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
910

1011
apply plugin: 'elasticsearch.internal-java-rest-test'
@@ -27,3 +28,9 @@ buildParams.bwcVersions.withWireCompatible(v -> v.after("8.11.0")) { bwcVersion,
2728
}
2829
}
2930

31+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
32+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
33+
usesBwcDistribution(Version.fromString("0.0.0"))
34+
systemProperty("tests.old_cluster_version", "0.0.0")
35+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
36+
}

‎x-pack/plugin/security/qa/multi-cluster/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* 2.0.
66
*/
77

8+
import org.elasticsearch.gradle.Version
89
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
910

1011
apply plugin: 'elasticsearch.internal-java-rest-test'
@@ -43,3 +44,10 @@ buildParams.bwcVersions.withWireCompatible() { bwcVersion, baseName ->
4344
include '**/RemoteClusterSecurityBWCToRCS2ClusterRestIT.class'
4445
}
4546
}
47+
48+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
49+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
50+
usesBwcDistribution(Version.fromString("0.0.0"))
51+
systemProperty("tests.old_cluster_version", "0.0.0")
52+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
53+
}

‎x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* 2.0.
66
*/
77

8+
import org.elasticsearch.gradle.Version
89
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
910

1011
apply plugin: 'elasticsearch.internal-java-rest-test'
@@ -25,3 +26,10 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
2526
systemProperty("tests.old_cluster_version", bwcVersion)
2627
}
2728
}
29+
30+
tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) {
31+
// We use a phony version here as the real version is provided via `tests.bwc.main.version` system property
32+
usesBwcDistribution(Version.fromString("0.0.0"))
33+
systemProperty("tests.old_cluster_version", "0.0.0")
34+
onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null }
35+
}

0 commit comments

Comments
 (0)