Skip to content

Commit c2be958

Browse files
authored
Ensure only snapshot jdbc driver versions are testing when running check (#89560) (#89596)
# Conflicts: # x-pack/plugin/sql/qa/jdbc/build.gradle
1 parent ff5d39d commit c2be958

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 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,8 @@ subprojects {
7474
BuildParams.bwcVersions.withIndexCompatiple { bwcVersion, baseName ->
7575
// Compatibility testing for JDBC driver started with version 7.9.0
7676
if (bwcVersion.onOrAfter(Version.fromString("7.9.0"))) {
77+
def cluster = testClusters.maybeCreate(baseName)
78+
7779
UnreleasedVersionInfo unreleasedVersion = BuildParams.bwcVersions.unreleasedInfo(bwcVersion)
7880
Configuration driverConfiguration = configurations.create("jdbcDriver${baseName}") {
7981
// TODO: Temporary workaround for https://github.com/elastic/elasticsearch/issues/73433
@@ -94,10 +96,13 @@ subprojects {
9496
}
9597

9698
final String bwcVersionString = bwcVersion.toString()
97-
tasks.register(bwcTaskName(bwcVersion), RestIntegTestTask) {
99+
tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
100+
useCluster cluster
98101
classpath = sourceSets.javaRestTest.runtimeClasspath + driverConfiguration
99102
testClassesDirs = sourceSets.javaRestTest.output.classesDirs
100103
systemProperty 'jdbc.driver.version', bwcVersionString
104+
nonInputProperties.systemProperty('tests.rest.cluster', "${-> cluster.allHttpSocketURI.join(",")}")
105+
nonInputProperties.systemProperty('tests.clustername', baseName)
101106
}
102107
}
103108
}

0 commit comments

Comments
 (0)