From 24f8da8ccf592b5509903201ef1220414b443355 Mon Sep 17 00:00:00 2001 From: Adam Yeats Date: Tue, 29 Oct 2024 16:20:06 +0000 Subject: [PATCH] Use shell script for checking Grafana readyness --- .github/workflows/e2e.yml | 15 +++++++++------ .github/workflows/grafana-bench.yml | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a7c549a1..0cff25c0 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -43,12 +43,15 @@ jobs: compose-file: './docker-compose.yml' - name: Wait for Grafana to start - uses: nev7n/wait_for_response@v1 - with: - url: 'http://localhost:3000/' - responseCode: 200 - timeout: 60000 - interval: 500 + run: | + curl http://localhost:3000 + #RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:3000) + #echo $response + #if [ $RESPONSE -ne 200 ]; then + # sleep 5; + # echo "Grafana is not accessible" + # exit 1 + #fi - name: Run Playwright tests run: yarn playwright test diff --git a/.github/workflows/grafana-bench.yml b/.github/workflows/grafana-bench.yml index 348078a0..27ce2e18 100644 --- a/.github/workflows/grafana-bench.yml +++ b/.github/workflows/grafana-bench.yml @@ -40,12 +40,15 @@ jobs: compose-file: './docker-compose.yml' - name: Wait for Grafana to start - uses: nev7n/wait_for_response@v1 - with: - url: 'http://localhost:3000/' - responseCode: 200 - timeout: 60000 - interval: 500 + run: | + curl http://localhost:3000 + #RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:3000) + #echo $response + #if [ $RESPONSE -ne 200 ]; then + # sleep 5; + # echo "Grafana is not accessible" + # exit 1 + #fi - name: Run Grafana Bench tests run: |