Skip to content

Commit 96d7097

Browse files
authored
Fix CI tests (#6032)
* Skip a newer tested in cat.templates * Skip all in 20_matching * Skip .ds-.logs-deprecation * Skip .deprecation * Another idea * Disable deprecation logging * Disable deprecation indexing * Skip ml test and update from clients-team * Final cleanup for 7.x
1 parent 6e62afe commit 96d7097

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.ci/run-elasticsearch.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@
77
# Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
88
# Export the NUMBER_OF_NODES variable to start more than 1 node
99

10-
# Version 1.1.0
10+
# Version 1.4.0
1111
# - Initial version of the run-elasticsearch.sh script
1212
# - Deleting the volume should not dependent on the container still running
1313
# - Fixed `ES_JAVA_OPTS` config
1414
# - Moved to STACK_VERSION and TEST_VERSION
1515
# - Refactored into functions and imports
1616
# - Support NUMBER_OF_NODES
17+
# - Added 5 retries on docker pull for fixing transient network errors
18+
# - Added flags to make local CCR configurations work
19+
# - Added action.destructive_requires_name=false as the default will be true in v8
20+
# - Added ingest.geoip.downloader.enabled=false as it causes false positives in testing
1721

1822
script_path=$(dirname $(realpath -s $0))
1923
source $script_path/functions/imports.sh
@@ -37,6 +41,7 @@ environment=($(cat <<-END
3741
--env path.repo=/tmp
3842
--env repositories.url.allowed_urls=http://snapshot.test*
3943
--env ingest.geoip.downloader.enabled=false
44+
--env cluster.deprecation_indexing.enabled=false
4045
END
4146
))
4247
if [[ "$TEST_SUITE" == "platinum" ]]; then

tests/Tests.YamlRunner/SkipList.fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ let SkipList = dict<SkipFile,SkipSection> [
157157
// Additional entries in regex: Failed cat.templates 10_basic.yml: Assert operation Match $body RegexAssertion
158158
SkipFile "cat.templates/10_basic.yml", Sections [ "Multiple template"; "Sort templates"; "No templates" ]
159159

160+
// Change from [] results in Unable to cast object of type 'System.Collections.Generic.List`1[System.Object]' to type 'System.Collections.Generic.Dictionary`2[System.Object,System.Object]'.
161+
SkipFile "cat.templates/20_matching.yml", All
162+
160163
//TODO has dates without strings which trips up our yaml parser
161164
SkipFile "runtime_fields/40_date.yml", All
162165
// double / int in object comparison
@@ -183,4 +186,7 @@ let SkipList = dict<SkipFile,SkipSection> [
183186
// Assertion expects two tokens but creates only one
184187
// Needs further investigation
185188
SkipFile "service_accounts/10_basic.yml", All
189+
190+
//Failed: Do operation Api search Reason: Catching error failed: Some(CatchRegex "\[categorization_filters\] cannot be used with \[categorization_analyzer\]") on server error
191+
SkipFile "ml/categorization_agg.yml", Section "Test categorization aggregation with poor settings"
186192
]

tests/Tests.YamlRunner/TestSuiteBootstrap.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) ->
3434
| "logs-mappings"
3535
| "metrics"
3636
| "metrics-settings"
37-
| "data-streams-mappings"
3837
| "metrics-mappings"
3938
| "synthetics"
4039
| "synthetics-settings"
4140
| "synthetics-mappings"
4241
| ".snapshot-blob-cache"
42+
| "data-streams-mappings"
4343
| ".deprecation-indexing-template" -> false
4444
| ".deprecation-indexing-mappings" -> false
4545
| ".deprecation-indexing-settings" -> false
@@ -48,6 +48,7 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) ->
4848
| s when s.StartsWith(".data-frame") -> false
4949
| s when s.StartsWith(".ml-") -> false
5050
| s when s.StartsWith(".transform-") -> false
51+
| s when s.StartsWith(".deprecation-") -> false
5152
| _ -> true
5253

5354
let getAndDeleteFilter (setup:_ -> DynamicResponse) (delete:(_ -> DynamicResponse)) filter =

0 commit comments

Comments
 (0)