@@ -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,7 @@ subprojects {
74
74
// Compatibility testing for JDBC driver started with version 7.9.0
75
75
BuildParams . bwcVersions. allIndexCompatible. findAll({ it. onOrAfter(Version . fromString(" 7.9.0" )) && it != VersionProperties . elasticsearchVersion }). each { bwcVersion ->
76
76
def baseName = " v${ bwcVersion} "
77
+ def cluster = testClusters. maybeCreate(baseName)
77
78
78
79
UnreleasedVersionInfo unreleasedVersion = BuildParams . bwcVersions. unreleasedInfo(bwcVersion)
79
80
Configuration driverConfiguration = configurations. create(" jdbcDriver${ baseName} " ) {
@@ -92,14 +93,16 @@ subprojects {
92
93
93
94
dependencies {
94
95
" jdbcDriver${ baseName} " (driverDependency)
95
-
96
96
}
97
97
98
98
final String bwcVersionString = bwcVersion. toString()
99
- tasks. register(bwcTaskName(bwcVersion), RestIntegTestTask ) {
99
+ tasks. register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask ) {
100
+ useCluster cluster
100
101
classpath = sourceSets. javaRestTest. runtimeClasspath + driverConfiguration
101
102
testClassesDirs = sourceSets. javaRestTest. output. classesDirs
102
103
systemProperty ' jdbc.driver.version' , bwcVersionString
104
+ nonInputProperties. systemProperty(' tests.rest.cluster' , " ${ -> cluster.allHttpSocketURI.join(",")} " )
105
+ nonInputProperties. systemProperty(' tests.clustername' , baseName)
103
106
}
104
107
}
105
108
}
0 commit comments