Skip to content

Commit ffcf0ea

Browse files
authored
Ensure only snapshot jdbc driver versions are testing when running check (elastic#89560)
1 parent 7f91884 commit ffcf0ea

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

x-pack/plugin/sql/qa/jdbc/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.elasticsearch.gradle.internal.BwcVersions.UnreleasedVersionInfo
22
import org.elasticsearch.gradle.Version
33
import org.elasticsearch.gradle.VersionProperties
44
import org.elasticsearch.gradle.internal.info.BuildParams
5-
import org.elasticsearch.gradle.internal.test.RestIntegTestTask
5+
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
66

77
description = 'Integration tests for SQL JDBC driver'
88
apply plugin: 'elasticsearch.java'
@@ -74,6 +74,7 @@ subprojects {
7474
// Compatibility testing for JDBC driver started with version 7.9.0
7575
BuildParams.bwcVersions.allIndexCompatible.findAll({ it.onOrAfter(Version.fromString("7.9.0")) && it != VersionProperties.elasticsearchVersion }).each { bwcVersion ->
7676
def baseName = "v${bwcVersion}"
77+
def cluster = testClusters.maybeCreate(baseName)
7778

7879
UnreleasedVersionInfo unreleasedVersion = BuildParams.bwcVersions.unreleasedInfo(bwcVersion)
7980
Configuration driverConfiguration = configurations.create("jdbcDriver${baseName}") {
@@ -92,14 +93,16 @@ subprojects {
9293

9394
dependencies {
9495
"jdbcDriver${baseName}"(driverDependency)
95-
9696
}
9797

9898
final String bwcVersionString = bwcVersion.toString()
99-
tasks.register(bwcTaskName(bwcVersion), RestIntegTestTask) {
99+
tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
100+
useCluster cluster
100101
classpath = sourceSets.javaRestTest.runtimeClasspath + driverConfiguration
101102
testClassesDirs = sourceSets.javaRestTest.output.classesDirs
102103
systemProperty 'jdbc.driver.version', bwcVersionString
104+
nonInputProperties.systemProperty('tests.rest.cluster', "${-> cluster.allHttpSocketURI.join(",")}")
105+
nonInputProperties.systemProperty('tests.clustername', baseName)
103106
}
104107
}
105108
}

0 commit comments

Comments
 (0)