Skip to content

Commit ea32069

Browse files
kumaabaditya-gupta36
authored andcommitted
ATLAS-5058: Update ci.yml to rely on healthchecks (#391)
1 parent 1a495f4 commit ea32069

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,16 @@ jobs:
104104
cd dev-support/atlas-docker
105105
export DOCKER_BUILDKIT=1
106106
export COMPOSE_DOCKER_CLI_BUILD=1
107+
docker compose -f docker-compose.atlas-base.yml build
107108
docker compose \
108-
-f docker-compose.atlas-base.yml \
109109
-f docker-compose.atlas.yml \
110110
-f docker-compose.atlas-hadoop.yml \
111111
-f docker-compose.atlas-hbase.yml \
112112
-f docker-compose.atlas-kafka.yml \
113-
-f docker-compose.atlas-hive.yml up -d
113+
-f docker-compose.atlas-hive.yml up -d --wait
114114
115115
- name: Check status of containers and remove them
116116
run: |
117-
sleep 60
118117
containers=(atlas atlas-hadoop atlas-hbase atlas-kafka atlas-hive);
119118
flag=true;
120119
for container in "${containers[@]}"; do

dev-support/atlas-docker/docker-compose.atlas-hadoop.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ services:
1515
ports:
1616
- "9000:9000"
1717
- "8088:8088"
18-
depends_on:
19-
- atlas-base
2018
healthcheck:
2119
test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ]
2220
interval: 30s

dev-support/atlas-docker/docker-compose.atlas-hive.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ services:
1414
tty: true
1515
networks:
1616
- atlas
17+
healthcheck:
18+
test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ]
19+
interval: 30s
20+
timeout: 10s
21+
retries: 30
22+
start_period: 40s
1723
ports:
1824
- "10000:10000"
1925
depends_on:
@@ -40,11 +46,10 @@ services:
4046
networks:
4147
- atlas
4248
healthcheck:
43-
test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ]
44-
interval: 30s
45-
timeout: 10s
49+
test: 'su -c "pg_isready -q" postgres'
50+
interval: 10s
51+
timeout: 2s
4652
retries: 30
47-
start_period: 40s
4853

4954
networks:
5055
atlas:

webapp/src/test/resources/json/search-parameters/attribute-filters.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"offset": 0,
1010
"entityFilters": {
1111
"attributeName": "name",
12+
"operator": "contains",
1213
"attributeValue": "testtable",
1314
"condition" : "OR",
1415
"criterion" : [

0 commit comments

Comments
 (0)