Skip to content

[ML] Check old cluster version in ModelRegistry upgrade tests #130625

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
davidkyle merged 3 commits into from
Jul 4, 2025
Merged

[ML] Check old cluster version in ModelRegistry upgrade tests #130625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4f8c2d
check old cluster version
davidkyle Jul 4, 2025
19cfb25
[CI] Auto commit changes from spotless
Jul 4, 2025
506a910
Update x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/ja…
davidkyle Jul 4, 2025
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
6 changes: 0 additions & 6 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,12 +411,6 @@ tests:
- class: org.elasticsearch.repositories.blobstore.testkit.analyze.GCSRepositoryAnalysisRestIT
method: testRepositoryAnalysis
issue: https://github.com/elastic/elasticsearch/issues/125668
- class: org.elasticsearch.xpack.application.ModelRegistryUpgradeIT
method: testUpgradeModels {upgradedNodes=0}
issue: https://github.com/elastic/elasticsearch/issues/125549
- class: org.elasticsearch.xpack.application.ModelRegistryUpgradeIT
method: testUpgradeModels {upgradedNodes=3}
issue: https://github.com/elastic/elasticsearch/issues/125535
- class: org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderIT
method: testEnterpriseDownloaderTask
issue: https://github.com/elastic/elasticsearch/issues/126124
Expand Down
9 changes: 9 additions & 0 deletions ...ade/src/javaRestTest/java/org/elasticsearch/xpack/application/ModelRegistryUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
import static org.hamcrest.Matchers.greaterThan;

public class ModelRegistryUpgradeIT extends InferenceUpgradeTestCase {

// Hugging Face embeddings and ELSER was added in 8.12.0
// but in 8.15 the endpoints were renamed. For the sake of this
// test can start at 8.15.0.
public static final String MIN_OLD_CLUSTER_VERSION = "8.15.0";

private static MockWebServer embeddingsServer;
private static MockWebServer elserServer;

Expand All @@ -50,6 +56,9 @@ public ModelRegistryUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
}

public void testUpgradeModels() throws Exception {
boolean oldClusterSupportsHF = oldClusterHasFeature("gte_v" + MIN_OLD_CLUSTER_VERSION);
assumeTrue("Test requires features added in " + MIN_OLD_CLUSTER_VERSION, oldClusterSupportsHF);

if (isOldCluster()) {
int numModels = randomIntBetween(5, 10);
for (int i = 0; i < numModels; i++) {
Expand Down