maybe?

rclayton-godaddy · Oct 16, 2019 · d618868 · d618868
1 parent 2feaa8b
commit d618868
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,8 @@ jobs:
     - name: npm install, and test
       run: |
         npm install
-        docker-compose -f docker-compose-v7.yml up -d
+        docker-compose -f docker-compose-v7-es-only.yml up -d
+        sleep 10
         npm test
       env:
         CI: true
diff --git a/docker-compose-v7-es-only.yml b/docker-compose-v7-es-only.yml
@@ -0,0 +1,9 @@
+---
+version: '3.6'
+services:
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
+    environment:
+      - discovery.type=single-node
+    container_name: elasticsearch
+    ports: ['9200:9200']
diff --git a/test/acceptance.test.js b/test/acceptance.test.js
@@ -25,7 +25,9 @@ var es
 tap.beforeEach(async () => {
   if (es) {
     es = IER()
-    await es.waitCluster()
+    if (!await es.isRunning()) {
+      await es.waitCluster()
+    }
   }
   const result = await client.info()
   esVersion = Number(result.body.version.number.split('.')[0])