From f7fdfeeeec89ece2742f2bf30819183998d1cbc1 Mon Sep 17 00:00:00 2001 From: Justin Slay Date: Mon, 23 May 2022 04:26:55 -0600 Subject: [PATCH] Swapout for OpenSearch --- .github/workflows/backend.yml | 6 +++--- .github/workflows/functional-tests.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index e3846b920a2..0a24ab1a184 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -29,11 +29,11 @@ jobs: - 5432:5432 # needed because the postgres container does not provide a healthcheck options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 - elasticsearch: - image: elasticsearch:7.10.1 + opensearch: + image: opensearch:2.0.0-rc1 ports: - 9200/tcp - options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10 + options: -e="discovery.type=single-node" --health-cmd="curl -XGET https://localhost:9200/_cluster/health -u 'admin:admin' --insecure" --health-interval=10s --health-timeout=5s --health-retries=10 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml index 055feac0971..b27e7335db6 100644 --- a/.github/workflows/functional-tests.yml +++ b/.github/workflows/functional-tests.yml @@ -11,11 +11,11 @@ jobs: MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }} services: - elasticsearch: - image: elasticsearch:7.10.1 + opensearch: + image: opensearchproject/opensearch:2.0.0-rc1 ports: - 9200:9200 - options: -e="discovery.type=single-node" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10 + options: -e="discovery.type=single-node" --health-cmd="curl -XGET https://localhost:9200/_cluster/health -u 'admin:admin' --insecure" --health-interval=10s --health-timeout=5s --health-retries=10 postgres: image: postgres