Bump docker compose version in CI (getsentry#2980)

* only rerun tests on v2.0.1 * change from http error to request error * use 3 retries like before
KingsGambitLab · Apr 20, 2024 · b06ebe5 · b06ebe5
1 parent da57b62
commit b06ebe5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/_integration-test/conftest.py b/_integration-test/conftest.py
@@ -18,11 +18,15 @@ def pytest_addoption(parser):
 
 @pytest.fixture(scope="session", autouse=True)
 def configure_self_hosted_environment(request):
- subprocess.run(["docker", "compose", "--ansi", "never", "up", "-d"], check=True)
+ subprocess.run(
+ ["docker", "compose", "--ansi", "never", "up", "-d"],
+ check=True,
+ capture_output=True,
+ )
  for i in range(TIMEOUT_SECONDS):
  try:
  response = httpx.get(SENTRY_TEST_HOST, follow_redirects=True)
- except httpx.NetworkError:
+ except httpx.RequestError:
  time.sleep(1)
  else:
  if response.status_code == 200:

diff --git a/_integration-test/test_backup.py b/_integration-test/test_backup.py
@@ -55,7 +55,11 @@ def test_import(setup_backup_restore_env_variables):
  ["docker", "compose", "--ansi", "never", "run", "web", "upgrade", "--noinput"],
  check=True,
  )
- subprocess.run(["docker", "compose", "--ansi", "never", "up", "-d"], check=True)
+ subprocess.run(
+ ["docker", "compose", "--ansi", "never", "up", "-d"],
+ check=True,
+ capture_output=True,
+ )
  sentry_admin_sh = os.path.join(os.getcwd(), "sentry-admin.sh")
  subprocess.run(
  [