From a78cfb959993f28352355c00b8bf4fcdaca7f9e0 Mon Sep 17 00:00:00 2001
From: Laurent Indermuehle <laurent.indermuehle@pm.me>
Date: Mon, 27 Mar 2023 16:02:45 +0200
Subject: [PATCH] Fix tests matrix

It is a mix of merge the wrong block and wrong URI to the docker images
---
 .github/workflows/ansible-test-plugins.yml | 113 +++++++--------------
 1 file changed, 39 insertions(+), 74 deletions(-)

diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml
index cc9eaa9..c3d3e1a 100644
--- a/.github/workflows/ansible-test-plugins.yml
+++ b/.github/workflows/ansible-test-plugins.yml
@@ -40,41 +40,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        db_engine_version:
-          - mysql_5.7.31
-          - mysql_8.0.22
-        ansible:
-          - stable-2.12
-          - stable-2.13
-          - stable-2.14
-          - devel
-        python:
-          - 3.6
-          - 3.8
-          - 3.9
-        connector:
-          - pymysql==0.7.10
-          - pymysql==0.9.3
-          - mysqlclient==2.0.1
-        exclude:
-          - db_engine_version: mysql_8.0.22
-            connector: pymysql==0.7.10
-          - python: 3.6
-            ansible: stable-2.12
-          - python: 3.6
-            ansible: stable-2.13
-          - python: 3.6
-            ansible: stable-2.14
-          - python: 3.6
-            ansible: devel
-          - python: 3.8
-            ansible: stable-2.13
-          - python: 3.8
-            ansible: stable-2.14
-          - python: 3.8
-            ansible: devel
-          - python: 3.9
-            ansible: stable-2.12
         include:
           # Before we can activate test with pymysql 1.0.2 we should debug the
           # following plugins:
@@ -92,17 +57,17 @@ jobs:
             db_engine_version: mysql:5.7.40
             python: '3.8'
             connector: pymysql==0.7.11
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my57-py38-pymysql0711:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my57-py38-pymysql0711:latest
           - ansible: stable-2.12
             db_engine_version: mysql:5.7.40
             python: '3.8'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my57-py38-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my57-py38-pymysql093:latest
           - ansible: stable-2.12
             db_engine_version: mysql:5.7.40
             python: '3.8'
             connector: mysqlclient==2.0.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my57-py38-mysqlclient201:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my57-py38-mysqlclient201:latest
 
 
           # ==================================================================
@@ -112,12 +77,12 @@ jobs:
             db_engine_version: mysql:8.0.31
             python: '3.8'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py38-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py38-pymysql093:latest
           - ansible: stable-2.12
             db_engine_version: mysql:8.0.31
             python: '3.8'
             connector: mysqlclient==2.0.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py38-mysqlclient201:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py38-mysqlclient201:latest
 
 
           # ==================================================================
@@ -127,23 +92,23 @@ jobs:
             db_engine_version: mysql:8.0.31
             python: '3.9'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py39-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py39-pymysql093:latest
           - ansible: stable-2.13
             db_engine_version: mysql:8.0.31
             python: '3.9'
             connector: mysqlclient==2.0.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py39-mysqlclient203:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py39-mysqlclient203:latest
 
           - ansible: stable-2.14
             db_engine_version: mysql:8.0.31
             python: '3.9'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py39-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py39-pymysql093:latest
           - ansible: stable-2.14
             db_engine_version: mysql:8.0.31
             python: '3.9'
             connector: mysqlclient==2.0.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py39-mysqlclient203:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py39-mysqlclient203:latest
 
 
           # ==================================================================
@@ -153,34 +118,34 @@ jobs:
           #   db_engine_version: mysql:8.0.31
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py310-pymysql102:latest
           - ansible: stable-2.13
             db_engine_version: mysql:8.0.31
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py310-mysqlclient211:latest
 
           # - ansible: stable-2.14
           #   db_engine_version: mysql:8.0.31
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py310-pymysql102:latest
           - ansible: stable-2.14
             db_engine_version: mysql:8.0.31
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py310-mysqlclient211:latest
 
           # - ansible: devel
           #   db_engine_version: mysql:8.0.31
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py310-pymysql102:latest
           - ansible: devel
             db_engine_version: mysql:8.0.31
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-my80-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-my80-py310-mysqlclient211:latest
 
           # ==================================================================
           # mariadb-client 10.3 + Python 3.8
@@ -189,22 +154,22 @@ jobs:
             db_engine_version: mariadb:10.4.27
             python: '3.8'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py38-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py38-pymysql093:latest
           - ansible: stable-2.12
             db_engine_version: mariadb:10.4.27
             python: '3.8'
             connector: mysqlclient==2.0.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py38-mysqlclient201:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py38-mysqlclient201:latest
           - ansible: stable-2.12
             db_engine_version: mariadb:10.5.18
             python: '3.8'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py38-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py38-pymysql093:latest
           - ansible: stable-2.12
             db_engine_version: mariadb:10.5.18
             python: '3.8'
             connector: mysqlclient==2.0.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py38-mysqlclient201:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py38-mysqlclient201:latest
 
 
           # ==================================================================
@@ -214,43 +179,43 @@ jobs:
             db_engine_version: mariadb:10.4.27
             python: '3.9'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-pymysql093:latest
           - ansible: stable-2.13
             db_engine_version: mariadb:10.4.27
             python: '3.9'
             connector: mysqlclient==2.0.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-mysqlclient203:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-mysqlclient203:latest
           - ansible: stable-2.13
             db_engine_version: mariadb:10.5.18
             python: '3.9'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-pymysql093:latest
           - ansible: stable-2.13
             db_engine_version: mariadb:10.5.18
             python: '3.9'
             connector: mysqlclient==2.0.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-mysqlclient203:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-mysqlclient203:latest
 
           - ansible: stable-2.14
             db_engine_version: mariadb:10.4.27
             python: '3.9'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-pymysql093:latest
           - ansible: stable-2.14
             db_engine_version: mariadb:10.4.27
             python: '3.9'
             connector: mysqlclient==2.0.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-mysqlclient203:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-mysqlclient203:latest
           - ansible: stable-2.14
             db_engine_version: mariadb:10.5.18
             python: '3.9'
             connector: pymysql==0.9.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-pymysql093:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-pymysql093:latest
           - ansible: stable-2.14
             db_engine_version: mariadb:10.5.18
             python: '3.9'
             connector: mysqlclient==2.0.3
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb103-py39-mysqlclient203:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb103-py39-mysqlclient203:latest
 
 
           # ==================================================================
@@ -260,64 +225,64 @@ jobs:
           #   db_engine_version: mariadb:10.5.18
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-pymysql102:latest
           - ansible: stable-2.13
             db_engine_version: mariadb:10.5.18
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-mysqlclient211:latest
           # - ansible: stable-2.13
           #   db_engine_version: mariadb:10.6.11
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-pymysql102:latest
           - ansible: stable-2.13
             db_engine_version: mariadb:10.6.11
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-mysqlclient211:latest
 
           # - ansible: stable-2.14
           #   db_engine_version: mariadb:10.5.18
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-pymysql102:latest
           - ansible: stable-2.14
             db_engine_version: mariadb:10.5.18
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-mysqlclient211:latest
           # - ansible: stable-2.14
           #   db_engine_version: mariadb:10.6.11
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-pymysql102:latest
           - ansible: stable-2.14
             db_engine_version: mariadb:10.6.11
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-mysqlclient211:latest
 
           # - ansible: devel
           #   db_engine_version: mariadb:10.5.18
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-pymysql102:latest
           - ansible: devel
             db_engine_version: mariadb:10.5.18
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-mysqlclient211:latest
           # - ansible: devel
           #   db_engine_version: mariadb:10.6.11
           #   python: '3.10'
           #   connector: pymysql==1.0.2
-          #   docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-pymysql102:latest
+          #   docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-pymysql102:latest
           - ansible: devel
             db_engine_version: mariadb:10.6.11
             python: '3.10'
             connector: mysqlclient==2.1.1
-            docker_image: ghcr.io/laurent-indermuehle/test-container-mariadb106-py310-mysqlclient211:latest
+            docker_image: ghcr.io/ansible-collections/community.mysql/test-container-mariadb106-py310-mysqlclient211:latest
 
     services:
       db_primary: