Skip to content

Commit

Permalink
Fixes synonyms CI issues for serverless
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosdelest committed Oct 11, 2024
1 parent a0481a6 commit 9e495a0
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 11 deletions.
9 changes: 0 additions & 9 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,15 +363,6 @@ tests:
- class: org.elasticsearch.xpack.inference.DefaultElserIT
method: testInferCreatesDefaultElser
issue: https://github.com/elastic/elasticsearch/issues/114503
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=synonyms/60_synonym_rule_get/Synonym set not found}
issue: https://github.com/elastic/elasticsearch/issues/114432
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=synonyms/60_synonym_rule_get/Get a synonym rule}
issue: https://github.com/elastic/elasticsearch/issues/114443
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=synonyms/60_synonym_rule_get/Synonym rule not found}
issue: https://github.com/elastic/elasticsearch/issues/114444
- class: org.elasticsearch.datastreams.logsdb.qa.LogsDbVersusLogsDbReindexedIntoStandardModeChallengeRestIT
method: testTermsAggregation
issue: https://github.com/elastic/elasticsearch/issues/114554
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ setup:
synonyms_set:
synonyms: "foo => bar, baz"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green

- do:
indices.create:
index: test_index
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ setup:
- synonyms: "test => check"
id: "test-id-3"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green

---
"Get synonyms set":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ setup:
- synonyms: "bye => goodbye"
id: "test-id-2"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green

---
"Delete synonyms set":
- do:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ setup:
persistent:
logger.org.elasticsearch.synonyms: DEBUG

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green


---
teardown:
- do:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ setup:
- synonyms: "test => check"
id: "test-id-3"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green

---
"Update a synonyms rule":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ setup:
id: "test-id-2"
- synonyms: "test => check"
id: "test-id-3"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms
timeout: 1m
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green

---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ setup:
- synonyms: "test => check"
id: "test-id-3"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green


---
"Delete synonym rule":
- do:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ setup:
- synonyms: "bye => goodbye"
id: "synonym-rule-2"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green

# Create an index with synonym_filter that uses that synonyms set
- do:
indices.create:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
- synonyms: "bye => goodbye"
id: "synonym-rule-2"

# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
level: shards
timeout: 10s
wait_for_status: green

# Create my_index1 with synonym_filter that uses synonyms_set1
- do:
indices.create:
Expand Down

0 comments on commit 9e495a0

Please sign in to comment.