From 2d5118410a3d708acba44280645ff12e655d1320 Mon Sep 17 00:00:00 2001 From: Leila Messallem Date: Mon, 27 May 2024 17:56:25 +0200 Subject: [PATCH 1/3] Temporary verbose curl output --- .github/workflows/pr-e2e-tests.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-e2e-tests.yaml b/.github/workflows/pr-e2e-tests.yaml index 9efb99073..0f6251b75 100644 --- a/.github/workflows/pr-e2e-tests.yaml +++ b/.github/workflows/pr-e2e-tests.yaml @@ -67,6 +67,7 @@ jobs: - name: Install dependencies run: poetry install --with dev - name: Wait for Weaviate to start - run: count=0; until curl --fail -s localhost:8080/v1/.well-known/ready; do ((count++)); [ $count -ge 10 ] && echo "Reached maximum retry limit" && exit 1; sleep 15; done + run: | + count=0; until curl -v --fail localhost:8080/v1/.well-known/ready; do ((count++)); [ $count -ge 10 ] && echo "Reached maximum retry limit" && exit 1; sleep 15; done - name: Run tests run: poetry run pytest ./tests/e2e From 2837cdaf966f99a82c2e0be93cac7f913f6d75d3 Mon Sep 17 00:00:00 2001 From: Leila Messallem Date: Mon, 27 May 2024 20:03:29 +0200 Subject: [PATCH 2/3] Test with docker healthcheck --- .github/workflows/pr-e2e-tests.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-e2e-tests.yaml b/.github/workflows/pr-e2e-tests.yaml index 0f6251b75..3cab01578 100644 --- a/.github/workflows/pr-e2e-tests.yaml +++ b/.github/workflows/pr-e2e-tests.yaml @@ -30,6 +30,11 @@ jobs: ports: - 8080:8080 - 50051:50051 + options: >- + --health-cmd "curl -f localhost:8080/v1/.well-known/ready" + --health-interval 15s + --health-retries 10 + --health-start-period 5s t2v-transformers: image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: @@ -66,8 +71,5 @@ jobs: run: poetry install --no-interaction - name: Install dependencies run: poetry install --with dev - - name: Wait for Weaviate to start - run: | - count=0; until curl -v --fail localhost:8080/v1/.well-known/ready; do ((count++)); [ $count -ge 10 ] && echo "Reached maximum retry limit" && exit 1; sleep 15; done - name: Run tests run: poetry run pytest ./tests/e2e From d20accfd32a1c561e1fc9f3bc9d9194ace9fe8aa Mon Sep 17 00:00:00 2001 From: Leila Messallem Date: Tue, 28 May 2024 09:45:27 +0200 Subject: [PATCH 3/3] Specify the shell for the runner --- .github/workflows/pr-e2e-tests.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-e2e-tests.yaml b/.github/workflows/pr-e2e-tests.yaml index 3cab01578..bb3054489 100644 --- a/.github/workflows/pr-e2e-tests.yaml +++ b/.github/workflows/pr-e2e-tests.yaml @@ -30,11 +30,6 @@ jobs: ports: - 8080:8080 - 50051:50051 - options: >- - --health-cmd "curl -f localhost:8080/v1/.well-known/ready" - --health-interval 15s - --health-retries 10 - --health-start-period 5s t2v-transformers: image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: @@ -71,5 +66,9 @@ jobs: run: poetry install --no-interaction - name: Install dependencies run: poetry install --with dev + - name: Wait for Weaviate to start + shell: bash + run: | + count=0; until curl -s --fail localhost:8080/v1/.well-known/ready; do ((count++)); [ $count -ge 10 ] && echo "Reached maximum retry limit" && exit 1; sleep 15; done - name: Run tests run: poetry run pytest ./tests/e2e