actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removing OpenDistro integration tests (#183)

Browse Source 
Signed-off-by: Vacha Shah <[email protected]>

Signed-off-by: Vacha Shah <[email protected]>
This commit is contained in:
Vacha Shah
2022-10-18 11:30:21 -07:00
committed by GitHub
parent e3729f4d31
commit 20cc9b4b98
7 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/functions/imports.sh
-3
View File
@@ -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}
.ci/opendistro/Dockerfile
-4
View File
@@ -1,4 +0,0 @@
FROM amazon/opendistro-for-elasticsearch:1.13.2
ARG SECURE_INTEGRATION
RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then /usr/share/elasticsearch/bin/elasticsearch-plugin remove opendistro_security; fi
COPY --chown=elasticsearch:elasticsearch .ci/opendistro/elasticsearch.yml /usr/share/elasticsearch/config/
.ci/opendistro/elasticsearch.yml
-2
View File
@@ -1,2 +0,0 @@
cluster.name: "docker-cluster"
network.host: 0.0.0.0
.ci/run-tests
+3 -3
View File
@@ -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
.github/workflows/integration-unreleased.yml
+1 -1
View File
@@ -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"
.github/workflows/integration.yml
+2 -3
View File
@@ -9,7 +9,6 @@ jobs:
strategy:
fail-fast: false
matrix:
cluster: ["opensearch"]
secured: ["true", "false"]
entry:
- { opensearch_version: 1.0.0 }
@@ -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 }}"
DEVELOPER_GUIDE.md
+3 -4
View File
@@ -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.