Skip to content

Commit

Permalink
removing conflicts with rebase
Browse files Browse the repository at this point in the history
Signed-off-by: Tokesh <tokesh789@gmail.com>
  • Loading branch information
Tokesh committed Nov 24, 2024
1 parent b7a8cae commit 4b48737
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 147 deletions.
2 changes: 1 addition & 1 deletion .cspell
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ millis
mxyz
opendistro
opensearch
OPENSEARCH
OPENSEARCH
2 changes: 1 addition & 1 deletion .github/workflows/test-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
- name: Run Tests
run: |
npm run test:spec -- \
--opensearch-insecure --verbose\
--opensearch-insecure \
--opensearch-version=${{ matrix.entry.version }} \
--coverage coverage/test-spec-coverage-${{ steps.tests.outputs.hash }}.json \
--opensearch-url=${{ matrix.entry.url || 'https://localhost:9200'}} \
Expand Down
128 changes: 0 additions & 128 deletions tests/replication/replica.yaml

This file was deleted.

19 changes: 2 additions & 17 deletions tests/snapshot/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
version: '3'

services:
opensearch-node1:
opensearch-cluster:
image: ${OPENSEARCH_DOCKER_HUB_PROJECT:-opensearchproject}/opensearch:${OPENSEARCH_VERSION:-latest}${OPENSEARCH_DOCKER_REF}
container_name: opensearch-node1
environment:
- 'OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_PASSWORD:-myStrongPassword123!}'
- OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m
- bootstrap.memory_lock=true
- cluster.initial_master_nodes=opensearch-node1,opensearch-node2
- cluster.name=opensearch-cluster
- discovery.seed_hosts=opensearch-node1,opensearch-node2
- node.name=opensearch-node1
- path.repo=/tmp/opensearch/repo
- plugins.index_state_management.job_interval=1
ulimits:
memlock:
soft: -1
hard: -1
ports:
- 9200:9200
- 9600:9600
environment:
- OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_PASSWORD:-myStrongPassword123!}
- OPENSEARCH_JAVA_OPTS=${OPENSEARCH_JAVA_OPTS}
- discovery.type=single-node
- path.repo=/tmp/opensearch/repo
- path.repo=/tmp/opensearch/repo

0 comments on commit 4b48737

Please sign in to comment.