ci: try retry and timeout on healthcheck

dhis2-sre · Jun 15, 2024 · 84a6baa · 84a6baa
1 parent d788430
commit 84a6baa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   call-workflow:
-    uses: dhis2-sre/gha-workflows/.github/workflows/im-build-test-deploy.yaml@master
+    uses: dhis2-sre/gha-workflows/.github/workflows/im-build-test-deploy.yaml@retry-health
     with:
       PROCESS_NAME: im-manager
       POD_NAME: im-manager

diff --git a/Makefile b/Makefile
@@ -23,8 +23,6 @@ check:
 	pre-commit run --all-files --show-diff-on-failure
 
 smoke-test:
-	docker compose up -d database rabbitmq redis
-	sleep 60
 	IMAGE_TAG=$(tag) docker compose up -d prod
 
 docker-image:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,6 +16,13 @@ services:
       - .env
     ports:
       - "8080:8080"
+    depends_on:
+      database:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     profiles:
       - prod