Skip to content
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

Removing OpenDistro integration tests #183

Merged
merged 1 commit into from
Oct 18, 2022
Merged

Removing OpenDistro integration tests #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions .ci/functions/imports.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ if [[ -z $opensearch_node_name ]]; then

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

export opensearch_url=$OPENSEARCH_URL_EXTENSION://${opensearch_node_name}:9200
export external_opensearch_url=${opensearch_url/$opensearch_node_name/localhost}
Expand Down
4 changes: 0 additions & 4 deletions .ci/opendistro/Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions .ci/opendistro/elasticsearch.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions .ci/run-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
export TEST_SUITE="${TEST_SUITE:=oss}"
export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
export CLUSTER="${1:-opensearch}"
export SECURE_INTEGRATION="${2:-false}"
export OPENSEARCH_VERSION="${3:-latest}"
export CLUSTER="${CLUSTER:-opensearch}"
export SECURE_INTEGRATION="${1:-false}"
export OPENSEARCH_VERSION="${2:-latest}"
if [[ "$SECURE_INTEGRATION" == "true" ]]; then
export OPENSEARCH_URL_EXTENSION="https"
else
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-unreleased.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
uses: actions/checkout@v2

- name: Run Integration Test
run: "./.ci/run-tests opensearch false SNAPSHOT"
run: "./.ci/run-tests false SNAPSHOT"
5 changes: 2 additions & 3 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
strategy:
fail-fast: false
matrix:
cluster: ["opensearch"]
secured: ["true", "false"]
entry:
- { opensearch_version: 1.0.0 }
Expand All @@ -30,5 +29,5 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Integ ${{ matrix.cluster }} secured=${{ matrix.secured }} version=${{matrix.entry.opensearch_version}}
run: "./.ci/run-tests ${{ matrix.cluster }} ${{ matrix.secured }} ${{ matrix.entry.opensearch_version }}"
- name: Integ OpenSearch secured=${{ matrix.secured }} version=${{matrix.entry.opensearch_version}}
run: "./.ci/run-tests ${{ matrix.secured }} ${{ matrix.entry.opensearch_version }}"
7 changes: 3 additions & 4 deletions DEVELOPER_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@ $ nox -rs test
To run the integration tests locally, run:

```
./.ci/run-tests opensearch true 1.3.0
./.ci/run-tests true 1.3.0
```

The first argument, `opensearch` tells the server type to run integration test against. Valid values are `opensearch` and `opendistro`.
The second argument tells whether to run server with security plugin enabled or not.
The third argument specifies the version of OpenSearch the tests should run against, if not specified, the tests run against the latest version. This argument is ignored if the server type is `opendistro`.
The first argument tells whether to run server with security plugin enabled or not.
The second argument specifies the version of OpenSearch the tests should run against, if not specified, the tests run against the latest version.

Note that integration tests require docker to be installed and running, and downloads quite a bit of data from over the internet and hence take few minutes to complete.

Expand Down