Skip to content

Commit

Permalink
Expanding and refactoring the vector rolling upgrade tests (#107020)
Browse files Browse the repository at this point in the history
This commit removes the legacy yaml rolling upgrade tests for vectors to the new rolling upgrade package. 

Also, it adds rolling upgrade tests for `int8_hnsw`.
  • Loading branch information
benwtrent committed Apr 10, 2024
1 parent c57dd98 commit 9e502aa
Show file tree
Hide file tree
Showing 5 changed files with 390 additions and 549 deletions.
22 changes: 1 addition & 21 deletions qa/rolling-upgrade-legacy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/



import org.elasticsearch.gradle.Version
import org.elasticsearch.gradle.internal.BwcVersions
import org.elasticsearch.gradle.internal.info.BuildParams
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

Expand Down Expand Up @@ -59,11 +59,6 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
systemProperty 'tests.upgrade_from_version', oldVersion
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseName)
if (bwcVersion.before("8.4.0")) {
excludeList.addAll(["old_cluster/30_vector_search/*"])
} else if (bwcVersion.before("8.6.0")) {
excludeList.addAll(["old_cluster/30_vector_search/Create indexed byte vectors and search"])
}
if (excludeList.isEmpty() == false) {
systemProperty 'tests.rest.blacklist', excludeList.join(',')
}
Expand All @@ -81,11 +76,6 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseName)
def excludeList = []
if (bwcVersion.before("8.4.0")) {
excludeList.addAll(["mixed_cluster/30_vector_search/*"])
} else if (bwcVersion.before("8.6.0")) {
excludeList.addAll(["mixed_cluster/30_vector_search/Search byte indices created in old cluster"])
}
if (excludeList.isEmpty() == false) {
systemProperty 'tests.rest.blacklist', excludeList.join(',')
}
Expand All @@ -103,11 +93,6 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseName)
def excludeList = []
if (bwcVersion.before("8.4.0")) {
excludeList.addAll(["mixed_cluster/30_vector_search/*"])
} else if (bwcVersion.before("8.6.0")) {
excludeList.addAll(["mixed_cluster/30_vector_search/Search byte indices created in old cluster"])
}
if (excludeList.isEmpty() == false) {
systemProperty 'tests.rest.blacklist', excludeList.join(',')
}
Expand All @@ -124,11 +109,6 @@ BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
nonInputProperties.systemProperty('tests.rest.cluster', baseCluster.map(c -> c.allHttpSocketURI.join(",")))
nonInputProperties.systemProperty('tests.clustername', baseName)
def excludeList = []
if (bwcVersion.before("8.4.0")) {
excludeList.addAll(["upgraded_cluster/30_vector_search/*"])
} else if (bwcVersion.before("8.6.0")) {
excludeList.addAll(["upgraded_cluster/30_vector_search/Search byte indices created in old cluster"])
}
if (excludeList.isEmpty() == false) {
systemProperty 'tests.rest.blacklist', excludeList.join(',')
}
Expand Down

This file was deleted.

0 comments on commit 9e502aa

Please sign in to comment.