From ebcbcb60ac9174b9d4a90e320bc9585b53e02ae0 Mon Sep 17 00:00:00 2001 From: Jill Regan Date: Fri, 13 Mar 2026 09:48:35 -0400 Subject: [PATCH] Update to use health endpoint check --- .github/workflows/e2e-tests.yml | 7 ++++--- tests/assert-env-set.sh | 8 -------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 21b3107..efca7db 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -137,8 +137,8 @@ jobs: run: ./tests/assert-env-unset.sh test-connect: - name: Connect (ubuntu-latest, ${{ matrix.version }}, export-env=${{ matrix.export-env }}) - runs-on: ubuntu-latest + name: Connect (${{ matrix.os }}, ${{ matrix.version }}, export-env=${{ matrix.export-env }}) + runs-on: ${{ matrix.os }} strategy: fail-fast: true max-parallel: 4 @@ -179,7 +179,8 @@ jobs: OP_CONNECT_CREDENTIALS: ${{ secrets.OP_CONNECT_CREDENTIALS }} run: | echo "$OP_CONNECT_CREDENTIALS" > 1password-credentials.json - docker compose -f tests/fixtures/docker-compose.yml up -d && sleep 15 + docker compose -f tests/fixtures/docker-compose.yml up -d + timeout 60 bash -c 'until curl -sf http://localhost:8080/health >/dev/null 2>&1; do sleep 2; done' - name: Configure 1Password Connect uses: ./configure diff --git a/tests/assert-env-set.sh b/tests/assert-env-set.sh index 9795651..7e4c877 100755 --- a/tests/assert-env-set.sh +++ b/tests/assert-env-set.sh @@ -39,14 +39,6 @@ assert_env_equals "FILE_MULTILINE_SECRET" "${MULTILINE_SECRET}" # WEBSITE/FILE_WEBSITE: required when ASSERT_WEBSITE=true (Service Account), skipped when false (Connect) if [ "${ASSERT_WEBSITE:-false}" = "true" ]; then - if [ -z "$(printenv WEBSITE 2>/dev/null)" ]; then - echo "Expected WEBSITE to be set (Service Account)" - exit 1 - fi - if [ -z "$(printenv FILE_WEBSITE 2>/dev/null)" ]; then - echo "Expected FILE_WEBSITE to be set (Service Account)" - exit 1 - fi assert_env_equals "WEBSITE" "${WEBSITE}" assert_env_equals "FILE_WEBSITE" "${WEBSITE}" fi