From c3458f4823be6bc0fd9868c4b087de7963c94583 Mon Sep 17 00:00:00 2001
From: Laurent Indermuehle <laurent.indermuehle@pm.me>
Date: Wed, 4 Jan 2023 17:10:37 +0100
Subject: [PATCH] Cut docker healthcheck unsupported by GHA

---
 .github/workflows/ansible-test-plugins.yml | 32 ++++------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml
index f7aa7fe..de14332 100644
--- a/.github/workflows/ansible-test-plugins.yml
+++ b/.github/workflows/ansible-test-plugins.yml
@@ -92,16 +92,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: msandbox
         ports:
           - 3307:3306
-        # We write our own health-cmd because the mariadb container does not
-        # provide a healthcheck
-        # options: >-
-        #   --health-cmd "mysqladmin ping -P 3306 -pmsandbox"
-        #   | grep alive
-        #   || exit 1
-        #   --health-start-period 10s
-        #   --health-interval 10s
-        #   --health-timeout 5s
-        #   --health-retries 6
+
       db_replica1:
         image: ${{ matrix.db_engine_version }}
         env:
@@ -109,14 +100,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: msandbox
         ports:
           - 3308:3306
-        # options: >
-        #   --health-cmd "mysqladmin ping -P 3306 -pmsandbox"
-        #   | grep alive
-        #   || exit 1
-        #   --health-start-period 10s
-        #   --health-interval 10s
-        #   --health-timeout 5s
-        #   --health-retries 6
+
       db_replica2:
         image: ${{ matrix.db_engine_version }}
         env:
@@ -124,16 +108,12 @@ jobs:
           MYSQL_ROOT_PASSWORD: msandbox
         ports:
           - 3309:3306
-        # options: >
-        #   --health-cmd "mysqladmin ping -P 3306 -pmsandbox"
-        #   | grep alive
-        #   || exit 1
-        #   --health-start-period 10s
-        #   --health-interval 10s
-        #   --health-timeout 5s
-        #   --health-retries 6
 
     steps:
+      - name: 'Wait 20s for the service containers to be healthy'
+        run:
+          sleep 20;
+
       - name: >-
           Perform integration testing against
           Ansible version ${{ matrix.ansible }}