@@ -2,7 +2,7 @@ import org.elasticsearch.gradle.internal.BwcVersions.UnreleasedVersionInfo
2
2
import org.elasticsearch.gradle.Version
3
3
import org.elasticsearch.gradle.VersionProperties
4
4
import org.elasticsearch.gradle.internal.info.BuildParams
5
- import org.elasticsearch.gradle.internal.test.RestIntegTestTask
5
+ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
6
6
7
7
description = ' Integration tests for SQL JDBC driver'
8
8
apply plugin : ' elasticsearch.java'
@@ -74,6 +74,8 @@ subprojects {
74
74
BuildParams . bwcVersions. withIndexCompatiple { bwcVersion , baseName ->
75
75
// Compatibility testing for JDBC driver started with version 7.9.0
76
76
if (bwcVersion. onOrAfter(Version . fromString(" 7.9.0" ))) {
77
+ def cluster = testClusters. maybeCreate(baseName)
78
+
77
79
UnreleasedVersionInfo unreleasedVersion = BuildParams . bwcVersions. unreleasedInfo(bwcVersion)
78
80
Configuration driverConfiguration = configurations. create(" jdbcDriver${ baseName} " ) {
79
81
// TODO: Temporary workaround for https://github.com/elastic/elasticsearch/issues/73433
@@ -94,10 +96,13 @@ subprojects {
94
96
}
95
97
96
98
final String bwcVersionString = bwcVersion. toString()
97
- tasks. register(bwcTaskName(bwcVersion), RestIntegTestTask ) {
99
+ tasks. register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask ) {
100
+ useCluster cluster
98
101
classpath = sourceSets. javaRestTest. runtimeClasspath + driverConfiguration
99
102
testClassesDirs = sourceSets. javaRestTest. output. classesDirs
100
103
systemProperty ' jdbc.driver.version' , bwcVersionString
104
+ nonInputProperties. systemProperty(' tests.rest.cluster' , " ${ -> cluster.allHttpSocketURI.join(",")} " )
105
+ nonInputProperties. systemProperty(' tests.clustername' , baseName)
101
106
}
102
107
}
103
108
}
0 commit comments