Skip to content

Commit 29823eb

Browse files
authored
Fix ibm_ace flake by gating ACE on MQ healthcheck (DataDog#23835)
* Gate ibm-ace on ibm-ace-mq health so tests don't race the MQ listener The ibm-ace container's depends_on only ensured ibm-ace-mq had started, not that QM1's listener was accepting connections, so the ACE server intermittently failed to connect with MQRC=2538. Add a chkmqready healthcheck to ibm-ace-mq and switch ibm-ace's depends_on to the long form with condition: service_healthy. * Retrigger CI
1 parent c02cf1c commit 29823eb

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

ibm_ace/tests/docker/docker-compose.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ services:
1919
- ./policy.descriptor:/home/aceuser/initial-config/policy/policy.descriptor
2020
- ./setdbparms.txt:/home/aceuser/initial-config/setdbparms/setdbparms.txt
2121
depends_on:
22-
- ibm-ace-mq
22+
ibm-ace-mq:
23+
condition: service_healthy
2324
ibm-ace-mq:
2425
container_name: ibm-ace-mq
2526
image: ibmcom/mq:${IBM_MQ_VERSION}
@@ -28,3 +29,9 @@ services:
2829
- LICENSE=accept
2930
ports:
3031
- 11414:1414
32+
healthcheck:
33+
test: ["CMD", "chkmqready"]
34+
interval: 10s
35+
timeout: 5s
36+
retries: 12
37+
start_period: 30s

0 commit comments

Comments
 (0)