From 4dbe5e2f172b1c29c5d28a7d83ce1eba749f023a Mon Sep 17 00:00:00 2001
From: Thomas Patzke <thomas@patzke.org>
Date: Sun, 29 Mar 2020 15:19:13 +0200
Subject: [PATCH] Moved Elasticsearch dependencies to generic dependencies

Omitting waiting for Elasticsearch as it should be started at this time.
---
 .github/workflows/sigma-test.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sigma-test.yml b/.github/workflows/sigma-test.yml
index f356f8ef830..3b4aff84996 100644
--- a/.github/workflows/sigma-test.yml
+++ b/.github/workflows/sigma-test.yml
@@ -23,17 +23,15 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r tools/requirements.txt -r tools/requirements-devel.txt -r tools/requirements-misp.txt -r tests/requirements-test.txt
-    - name: Test Sigma Tools and Rules
-      run: |
-        make test
-    - name: Test Generated Elasticsearch Query Strings
-      run: |
         wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
         sudo apt install -y apt-transport-https
         echo "deb https://artifacts.elastic.co/packages/7.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic.list
         sudo apt update
-        sudo apt install -y elasticsearch curl jq
+        sudo apt install -y elasticsearch
         sudo systemctl start elasticsearch
-        until curl -s elasticsearch:9200; do echo "Waiting for Elasticsearch server..."; sleep 10; done
-        until curl -s elasticsearch:9200/_cluster/health | jq -e '.status != "red"'; do echo "Waiting for Elasticsearch cluster to become ready..."; sleep 10; done
+    - name: Test Sigma Tools and Rules
+      run: |
+        make test
+    - name: Test Generated Elasticsearch Query Strings
+      run: |
         make test-backend-es-qs