🌟support of OpenSearch as a search database

- stop docker compose environment before running the next stop
linagora · Jan 4, 2024 · c2847d8 · c2847d8
1 parent a2272b6
commit c2847d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -21,8 +21,12 @@ jobs:
       - uses: actions/checkout@v2
       - name: e2e-mongo-test
         run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:all
+      - name: e2e-mongo-test-clean
+        run: cd tdrive && docker-compose -f docker-compose.tests.yml stop
       - name: e2e-opensearch-test
         run: cd tdrive && docker-compose -f docker-compose.dev.tests.opensearch.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=opensearch -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:all
+      - name: e2e-opensearch-test-clean
+        run: cd tdrive && docker-compose -f docker-compose.dev.tests.opensearch.yml stop
       - name: e2e-cassandra-test
         run: cd tdrive && docker-compose -f docker-compose.tests.yml up -d scylladb elasticsearch rabbitmq && sleep 60 && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=elasticsearch -e DB_DRIVER=cassandra node npm run test:all
       - name: coverage

diff --git a/tdrive/docker-compose.dev.tests.opensearch.yml b/tdrive/docker-compose.dev.tests.opensearch.yml
@@ -24,7 +24,7 @@ services:
 #    volumes:
 #      - opensearch-data1:/usr/share/opensearch/data # Creates volume called opensearch-data1 and mounts it to the container
     ports:
-      - 9202:9200 # REST API
+      - 9200:9200 # REST API
 #      - 9600:9600 # Performance Analyzer
 #   networks:
  #     - opensearch-net # All of the containers will join the same Docker bridge network
@@ -51,7 +51,7 @@ services:
       - DB_DRIVER
       - PUBSUB_URLS=amqp://guest:guest@rabbitmq:5672
       - SEARCH_OS_FLUSHINTERVAL=1
-      - SEARCH_OS_ENDPOINT=https://opensearch-node1:9202
+      - SEARCH_OS_ENDPOINT=https://opensearch-node1:9200
       - SEARCH_OS_PASSWORD=admin
       - SEARCH_OS_USE_AUTH=true
       - SEARCH_OS_USERNAME=admin