Skip to content

Ensure only snapshot jdbc driver versions are testing when running check #89560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark-vieira merged 1 commit into from
Aug 24, 2022
Merged

Ensure only snapshot jdbc driver versions are testing when running check #89560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions x-pack/plugin/sql/qa/jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.elasticsearch.gradle.internal.BwcVersions.UnreleasedVersionInfo
import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.VersionProperties
import org.elasticsearch.gradle.internal.info.BuildParams
import org.elasticsearch.gradle.internal.test.RestIntegTestTask
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

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

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

dependencies {
"jdbcDriver${baseName}"(driverDependency)

}

final String bwcVersionString = bwcVersion.toString()
tasks.register(bwcTaskName(bwcVersion), RestIntegTestTask) {
tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
useCluster cluster
classpath = sourceSets.javaRestTest.runtimeClasspath + driverConfiguration
testClassesDirs = sourceSets.javaRestTest.output.classesDirs
systemProperty 'jdbc.driver.version', bwcVersionString
nonInputProperties.systemProperty('tests.rest.cluster', "${-> cluster.allHttpSocketURI.join(",")}")
nonInputProperties.systemProperty('tests.clustername', baseName)
}
}
}
Expand Down