This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d4b81ba1 ATLAS-5058: Update ci.yml to rely on healthchecks (#391)
2d4b81ba1 is described below

commit 2d4b81ba19099c25815f05773efac51c1008fa37
Author: Abhishek Kumar <a...@apache.org>
AuthorDate: Wed Jul 9 13:43:17 2025 -0700

    ATLAS-5058: Update ci.yml to rely on healthchecks (#391)
---
 .github/workflows/ci.yml                                 |  5 ++---
 dev-support/atlas-docker/docker-compose.atlas-hadoop.yml |  2 --
 dev-support/atlas-docker/docker-compose.atlas-hive.yml   | 13 +++++++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 009cd5b19..136d1a54d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -104,17 +104,16 @@ jobs:
           cd dev-support/atlas-docker
           export DOCKER_BUILDKIT=1
           export COMPOSE_DOCKER_CLI_BUILD=1
+          docker compose -f docker-compose.atlas-base.yml build 
           docker compose \
-          -f docker-compose.atlas-base.yml \
           -f docker-compose.atlas.yml \
           -f docker-compose.atlas-hadoop.yml \
           -f docker-compose.atlas-hbase.yml \
           -f docker-compose.atlas-kafka.yml \
-          -f docker-compose.atlas-hive.yml up -d
+          -f docker-compose.atlas-hive.yml up -d --wait
 
       - name: Check status of containers and remove them
         run: |
-          sleep 60
           containers=(atlas atlas-hadoop atlas-hbase atlas-kafka atlas-hive);
           flag=true;
           for container in "${containers[@]}"; do
diff --git a/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml 
b/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml
index 16c1949ba..a6880fc22 100644
--- a/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml
+++ b/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml
@@ -15,8 +15,6 @@ services:
     ports:
       - "9000:9000"
       - "8088:8088"
-    depends_on:
-      - atlas-base
     healthcheck:
       test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report 
| grep -q 'Live datanodes'\"" ]
       interval: 30s
diff --git a/dev-support/atlas-docker/docker-compose.atlas-hive.yml 
b/dev-support/atlas-docker/docker-compose.atlas-hive.yml
index 3acb431a1..9934a9d12 100644
--- a/dev-support/atlas-docker/docker-compose.atlas-hive.yml
+++ b/dev-support/atlas-docker/docker-compose.atlas-hive.yml
@@ -14,6 +14,12 @@ services:
     tty: true
     networks:
       - atlas
+    healthcheck:
+      test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report 
| grep -q 'Live datanodes'\"" ]
+      interval: 30s
+      timeout: 10s
+      retries: 30
+      start_period: 40s
     ports:
       - "10000:10000"
     depends_on:
@@ -40,11 +46,10 @@ services:
     networks:
       - atlas
     healthcheck:
-      test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report 
| grep -q 'Live datanodes'\"" ]
-      interval: 30s
-      timeout: 10s
+      test: 'su -c "pg_isready -q" postgres'
+      interval: 10s
+      timeout: 2s
       retries: 30
-      start_period: 40s
 
 networks:
   atlas:

Reply via email to