File tree Expand file tree Collapse file tree 2 files changed +10
-6
lines changed
x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -411,12 +411,6 @@ tests:
411
411
- class : org.elasticsearch.repositories.blobstore.testkit.analyze.GCSRepositoryAnalysisRestIT
412
412
method : testRepositoryAnalysis
413
413
issue : https://github.com/elastic/elasticsearch/issues/125668
414
- - class : org.elasticsearch.xpack.application.ModelRegistryUpgradeIT
415
- method : testUpgradeModels {upgradedNodes=0}
416
- issue : https://github.com/elastic/elasticsearch/issues/125549
417
- - class : org.elasticsearch.xpack.application.ModelRegistryUpgradeIT
418
- method : testUpgradeModels {upgradedNodes=3}
419
- issue : https://github.com/elastic/elasticsearch/issues/125535
420
414
- class : org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderIT
421
415
method : testEnterpriseDownloaderTask
422
416
issue : https://github.com/elastic/elasticsearch/issues/126124
Original file line number Diff line number Diff line change 20
20
import java .util .Map ;
21
21
import java .util .stream .Collectors ;
22
22
23
+ import static org .elasticsearch .xpack .application .HuggingFaceServiceUpgradeIT .HF_EMBEDDINGS_ADDED ;
23
24
import static org .elasticsearch .xpack .application .HuggingFaceServiceUpgradeIT .elserConfig ;
24
25
import static org .elasticsearch .xpack .application .HuggingFaceServiceUpgradeIT .elserResponse ;
25
26
import static org .elasticsearch .xpack .application .HuggingFaceServiceUpgradeIT .embeddingConfig ;
26
27
import static org .hamcrest .Matchers .equalTo ;
27
28
import static org .hamcrest .Matchers .greaterThan ;
28
29
29
30
public class ModelRegistryUpgradeIT extends InferenceUpgradeTestCase {
31
+
32
+ // Hugging Face embeddings and ELSER was added in 8.12.0
33
+ // but in 8.15 the endpoints were renamed. For the sake of this
34
+ // test can can start at 8.15.0.
35
+ public static final String MIN_OLD_CLUSTER_VERSION = "8.15.0" ;
36
+
30
37
private static MockWebServer embeddingsServer ;
31
38
private static MockWebServer elserServer ;
32
39
@@ -50,6 +57,9 @@ public ModelRegistryUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
50
57
}
51
58
52
59
public void testUpgradeModels () throws Exception {
60
+ boolean oldClusterSupportsHF = oldClusterHasFeature ("gte_v" + MIN_OLD_CLUSTER_VERSION );
61
+ assumeTrue ("Test requires features added in " + MIN_OLD_CLUSTER_VERSION , oldClusterSupportsHF );
62
+
53
63
if (isOldCluster ()) {
54
64
int numModels = randomIntBetween (5 , 10 );
55
65
for (int i = 0 ; i < numModels ; i ++) {
You can’t perform that action at this time.
0 commit comments