Skip to content

Commit

Permalink
Fixing failing tests (#59)
Browse files Browse the repository at this point in the history
* Fixing failing tests

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Add support to run tests with admin for security

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Removing open-distro integration tests

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Ignore some tests for search aggregation for security

Signed-off-by: Vacha Shah <vachshah@amazon.com>

Signed-off-by: Vacha Shah <vachshah@amazon.com>
  • Loading branch information
VachaShah authored Aug 25, 2022
1 parent 1d32ca5 commit ae91a4d
Show file tree
Hide file tree
Showing 11 changed files with 324 additions and 197 deletions.
6 changes: 1 addition & 5 deletions .ci/functions/imports.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ if [[ -z $opensearch_node_name ]]; then
export OPENSEARCH_URL_EXTENSION="http"
fi

if [[ "$CLUSTER" == "opendistro" ]]; then
export opensearch_image=amazon/opendistro-for-elasticsearch
else
export opensearch_image=opensearchproject/opensearch
fi
export opensearch_image=opensearchproject/opensearch

export opensearch_url=$OPENSEARCH_URL_EXTENSION://${opensearch_node_name}:9200
export external_opensearch_url=${opensearch_url/$opensearch_node_name/localhost}
Expand Down
6 changes: 0 additions & 6 deletions .ci/opendistro/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions .ci/opendistro/docker-compose.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci/test-matrix.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

STACK_VERSION:
- 1.x-SNAPSHOT
- 2.x-SNAPSHOT

RUST_TOOLCHAIN:
- latest
Expand Down
22 changes: 8 additions & 14 deletions .github/workflows/test-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@ jobs:
name: Test
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
entry:
- { cluster: 'opendistro', version: '1.13.3', secured: 'true' }
- { cluster: 'opendistro', version: '1.13.3', secured: 'false' }
- { cluster: 'opensearch', version: '1.2.4', secured: 'true' }
- { cluster: 'opensearch', version: '1.2.4', secured: 'false' }
- { cluster: 'opensearch', version: '1.3.1', secured: 'true' }
- { cluster: 'opensearch', version: '1.3.1', secured: 'false' }
- { cluster: 'opensearch', version: '1.2.4', secured: 'true' }
- { cluster: 'opensearch', version: '1.2.4', secured: 'false' }
- { cluster: 'opensearch', version: '1.1.0', secured: 'true' }
- { cluster: 'opensearch', version: '1.1.0', secured: 'false' }
- { cluster: 'opensearch', version: '2.0.0', secured: 'true' }
- { cluster: 'opensearch', version: '2.0.0', secured: 'false' }
- { version: '1.1.0' }
- { version: '1.2.4' }
- { version: '1.3.4' }
- { version: '2.2.0' }
secured: ["true", "false"]

steps:
- name: Checkout
Expand All @@ -40,6 +34,6 @@ jobs:
toolchain: nightly
override: true
components: rustfmt, clippy
- name: Integ ${{ matrix.entry.cluster }} ${{ matrix.entry.version }} secured=${{ matrix.entry.secured }}
run: "./.ci/run-tests ${{ matrix.entry.cluster }} ${{ matrix.entry.version }} ${{ matrix.entry.secured }}"
- name: Integ OpenSearch ${{ matrix.entry.version }} secured=${{ matrix.secured }}
run: "./.ci/run-tests opensearch ${{ matrix.entry.version }} ${{ matrix.secured }}"

44 changes: 44 additions & 0 deletions yaml_test_runner/skip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,47 @@ tests:
# The use of an invalid window interval results in a 400 response which looks like
# it suppresses the sending of deprecation headers
- "Bad window deprecated interval"

free/indices.put_mapping/10_basic.yml:
# The type parameter is removed in 2.0
- "Put mappings with explicit _doc type"
- "Put mappings with explicit _doc type bwc"

free/cat.health/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Help"

free/cat.nodes/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Test cat nodes output"

free/cluster.health/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Get cluster health has same value for discovered_master and discovered_cluster_manager"
- "cluster health with closed index (pre 7.2.0)"

free/cluster.reroute/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Cluster reroute returns cluster_manager_node"

free/cluster.reroute/20_response_filtering.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Filter the cluster reroute by cluster_manager_node only should work"

free/cluster.state/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Get cluster state returns cluster_manager_node"

free/cluster.state/20_filtering.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Filter the cluster state by cluster_manager_node only should work"

free/cluster.stats/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "get cluster stats nodes count with both master and cluster_manager"

free/cluster.put_settings/10_basic.yml:
- "Test put and reset persistent settings"

free/search/230_interval_query.yml:
- "*"
234 changes: 234 additions & 0 deletions yaml_test_runner/skip_with_security.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
# Skip file of features and tests to skip when running with a secure OpenSearch cluster.
# This is used at compilation time, when compiling tests from the YAML tests, to not generate tests that match
# on name or features defined below that should be skipped. Accordingly, changing values in this file requires
# recompiling tests in order for the changes to take effect.

# tests to skip generating and compiling a test for
features:
- node_selector
- stash_path_replace
- embedded_stash_key

# tests to skip generating and compiling a test for
tests:

free/cat.aliases/10_basic.yml:
# this test fails as the regex needs a \n before the ending $
- "Multiple alias names"

free/cat.indices/10_basic.yml:
# this test fails as the regex needs a \n before the ending $
- "Test cat indices using health status"

free/cat.templates/10_basic.yml:
# Regex do not account for hidden templates returned by the request
- "Multiple template"
- "No templates"
- "Sort templates"

free/indices.flush/10_basic.yml:
# uses number as a key into object. serde_json::Value expects a string key
- "Index synced flush rest test"

free/indices.segments/10_basic.yml:
# uses number as a key into object. serde_json::Value expects a string key
- "basic segments test"

free/indices.shard_stores/10_basic.yml:
# uses number as a key into object. serde_json::Value expects a string key
- "*"

free/indices.stats/12_level.yml:
# uses number as a key into object. serde_json::Value expects a string key
- "Level - shards"

free/nodes.info/10_basic.yml:
# node has a lot more roles than those checked in the test (expects "ingest", finds "data_cold")
- "node_info role test"

free/search.aggregation/250_moving_fn.yml:
# The use of an invalid window interval results in a 400 response which looks like
# it suppresses the sending of deprecation headers
- "Bad window deprecated interval"

free/indices.put_mapping/10_basic.yml:
# The type parameter is removed in 2.0
- "Put mappings with explicit _doc type"
- "Put mappings with explicit _doc type bwc"

free/cat.health/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Help"

free/cat.nodes/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Test cat nodes output"

free/cluster.health/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Get cluster health has same value for discovered_master and discovered_cluster_manager"
- "cluster health with closed index (pre 7.2.0)"
- "cluster health basic test, one index"
- "cluster health basic test, one index with wait for active shards"
- "cluster health basic test, one index with wait for all active shards"

free/cluster.reroute/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Cluster reroute returns cluster_manager_node"

free/cluster.reroute/20_response_filtering.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Filter the cluster reroute by cluster_manager_node only should work"

free/cluster.state/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Get cluster state returns cluster_manager_node"

free/cluster.state/20_filtering.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "Filter the cluster state by cluster_manager_node only should work"

free/cluster.stats/10_basic.yml:
# Should be fixed after inclusive naming changes - master -> cluster_manager
- "get cluster stats nodes count with both master and cluster_manager"

free/cluster.put_settings/10_basic.yml:
- "Test put and reset persistent settings"

free/search/230_interval_query.yml:
- "*"

free/cat.allocation/10_basic.yml:
- "Node ID"
- "Bytes"

free/cat.count/10_basic.yml:
- "Test cat count output"

free/cat.recovery/10_basic.yml:
- "Test cat recovery output"

free/cat.segments/10_basic.yml:
- "Test cat segments output"

free/cat.shards/10_basic.yml:
- "Test cat shards output"
- "Test cat shards sort"

free/cat.snapshots/10_basic.yml:
- "Test cat snapshots output"

free/cluster.allocation_explain/10_basic.yml:
- "cluster shard allocation explanation test with empty request"

free/cluster.health/20_request_timeout.yml:
- "cluster health request timeout waiting for active shards"

free/indices.refresh/10_basic.yml:
- "Indices refresh test _all"
- "Indices refresh test empty array"

free/indices.stats/10_index.yml:
- "Index - all"
- "Index - blank"
- "Index - pattern"
- "Index - star"

free/msearch/10_basic.yml:
- "Basic multi-search"
- "Least impact smoke test"

free/range/10_basic.yml:
- "Integer range"

free/search/10_source_filtering.yml:
- "*"

free/search/120_batch_reduce_size.yml:
- "batched_reduce_size 2 with 5 shards"

free/search/140_pre_filter_search_shards:
- "pre_filter_shard_size with shards that have no hit"

free/search/20_default_values.yml:
- "Search with new response format"

free/search/40_indices_boost.yml:
- "*"

free/search/140_pre_filter_search_shards.yml:
- "pre_filter_shard_size with shards that have no hit"

free/search.aggregation/100_avg_metric.yml:
- "*"

free/search.aggregation/10_histogram.yml:
- "Basic test"
- "Format test"

free/search.aggregation/110_max_metric.yml:
- "*"

free/search.aggregation/120_min_metric.yml:
- "*"

free/search.aggregation/130_sum_metric.yml:
- "*"

free/search.aggregation/140_value_count_metric.yml:
- "*"

free/search.aggregation/150_stats_metric.yml:
- "*"

free/search.aggregation/160_extended_stats_metric.yml:
- "*"

free/search.aggregation/170_cardinality_metric.yml:
- "*"

free/search.aggregation/180_percentiles_tdigest_metric.yml:
- "*"

free/search.aggregation/190_percentiles_hdr_metric.yml:
- "*"

free/search.aggregation/20_terms.yml:
- "*"

free/search.aggregation/220_filters_bucket.yml:
- "*"

free/search.aggregation/260_weighted_avg.yml:
- "Basic test"

free/search.aggregation/270_median_absolute_deviation_metric.yml:
- "*"

free/search.aggregation/280_rare_terms.yml:
- "*"

free/search.aggregation/280_geohash_grid.yml:
- "Basic test"

free/search.aggregation/290_geotile_grid.yml:
- "Basic test"

free/search.aggregation/320_missing.yml:
- "*"

free/search.aggregation/340_geo_distance.yml:
- "basic"

free/search.aggregation/40_range.yml:
- "*"

free/search.aggregation/50_filter.yml:
- "*"

free/snapshot.create/10_basic.yml:
- "Create a snapshot"

free/snapshot.restore/10_basic.yml:
- "Create a snapshot and then restore it"

Loading

0 comments on commit ae91a4d

Please sign in to comment.