[CI] Add 2024 versions to tests

.github/workflows/ansible-test-plugins.yml

@@ -53,16 +53,11 @@ jobs:
           - mariadb
         db_engine_version:
           - '8.0.38'
-          # - '8.4.1'  # Unable to install mysql-client on Ubuntu 20.04 default container used by ansible-test
+          - '8.4.1'
           - '10.4.34'
           - '10.5.25'
           - '10.6.18'
           - '10.11.8'
-        python:
-          - '3.8'
-          - '3.9'
-          - '3.10'
-          - '3.11'
         connector_name:
           - pymysql
           - mysqlclient
@@ -78,15 +73,13 @@ jobs:
           # RHEL8 context
           - connector_name: pymysql
             connector_version: '0.10.1'
-            python: '3.6'
             ansible: stable-2.16
             db_engine_name: mariadb
             db_engine_version: '10.11.8'
 
           # RHEL9 context
           - connector_name: pymysql
             connector_version: '1.1.1'
-            python: '3.9'
             ansible: stable-2.17
             db_engine_name: mariadb
             db_engine_version: '10.11.8'
@@ -125,81 +118,9 @@ jobs:
           - connector_name: mysqlclient
             connector_version: '1.0.2'
 
-          - db_engine_version: '8.4.1'
-            python: '3.8'
-
-          - db_engine_version: '10.4.34'
-            python: '3.10'
-
-          - db_engine_version: '10.4.34'
-            python: '3.11'
-
           - db_engine_version: '10.4.34'
             ansible: devel
 
-          - db_engine_version: '10.6.18'
-            python: '3.8'
-
-          - db_engine_version: '10.6.18'
-            python: '3.9'
-
-          - python: '3.8'
-            connector_version: '1.0.2'
-
-          - python: '3.8'
-            connector_version: '2.0.3'
-
-          - python: '3.8'
-            connector_version: '2.1.1'
-
-          - python: '3.9'
-            connector_version: '1.0.2'
-
-          - python: '3.9'
-            connector_version: '2.0.1'
-
-          - python: '3.9'
-            connector_version: '2.1.1'
-
-          - python: '3.10'
-            connector_version: '0.9.3'
-
-          - python: '3.10'
-            connector_version: '2.0.1'
-
-          - python: '3.10'
-            connector_version: '2.0.3'
-
-          - python: '3.11'
-            connector_version: '0.9.3'
-
-          - python: '3.11'
-            connector_version: '1.0.2'
-
-          - python: '3.11'
-            connector_version: '2.0.1'
-
-          - python: '3.11'
-            connector_version: '2.0.3'
-
-          - python: '3.8'
-            ansible: stable-2.16
-
-          - python: '3.8'
-            ansible: stable-2.17
-
-          - python: '3.8'
-            ansible: devel
-
-          - python: '3.9'
-            ansible: stable-2.16
-
-          - python: '3.9'
-            ansible: stable-2.17
-
-          - python: '3.9'
-            ansible: devel
-
     services:
       db_primary:
         image: docker.io/library/${{ matrix.db_engine_name }}:${{ matrix.db_engine_version }}
@@ -281,10 +202,10 @@ jobs:
       - name: >-
           Perform integration testing against
           Ansible version ${{ matrix.ansible }}
-          under Python ${{ matrix.python }}
         uses: ansible-community/ansible-test-gh-action@release/v1
         with:
           ansible-core-version: ${{ matrix.ansible }}
+          docker-image: ubuntu2204
           pre-test-cmd: >-
             echo Setting db_engine_name to "${{ matrix.db_engine_name }}"...;
             echo -n "${{ matrix.db_engine_name }}"
@@ -303,14 +224,9 @@ jobs:
             echo -n "${{ matrix.connector_version }}"
             > tests/integration/connector_version;
 
-            echo Setting Python version to "${{ matrix.python }}"...;
-            echo -n "${{ matrix.python }}"
-            > tests/integration/python;
-
             echo Setting Ansible version to "${{ matrix.ansible }}"...;
             echo -n "${{ matrix.ansible }}"
             > tests/integration/ansible
-          target-python-version: ${{ matrix.python }}
           testing-type: integration
 
   units:

Makefile

@@ -17,7 +17,6 @@ test-integration:
 	@echo -n $(db_engine_version) > tests/integration/db_engine_version
 	@echo -n $(connector_name) > tests/integration/connector_name
 	@echo -n $(connector_version) > tests/integration/connector_version
-	@echo -n $(python) > tests/integration/python
 	@echo -n $(ansible) > tests/integration/ansible
 
 	# Create podman network for systems missing it. Error can be ignored
@@ -90,7 +89,7 @@ test-integration:
 	https://github.com/ansible/ansible/archive/$(ansible).tar.gz; \
 	set -x; \
 	ansible-test integration $(target) -v --color --coverage --diff \
-	--docker --python $(python) \
+	--docker ubuntu2204 \
 	--docker-network podman $(_continue_on_errors) $(_keep_containers_alive); \
 	set +x
 	# End of venv
@@ -99,7 +98,6 @@ test-integration:
 	rm tests/integration/db_engine_version
 	rm tests/integration/connector_name
 	rm tests/integration/connector_version
-	rm tests/integration/python
 	rm tests/integration/ansible
 ifndef keep_containers_alive
 	podman stop --time 0 --ignore primary replica1 replica2

README.md

@@ -106,17 +106,18 @@ Here is the table for the support timeline:
 
 ### Python
 
-- 3.8
-- 3.9
-- 3.10
-- 3.11 (collection version >= 3.10.0)
+- 3.8 (Unit tests only)
+- 3.9 (Unit tests only)
+- 3.10 (Sanity, Units and integrations tests)
+- 3.11 (Unit tests only, collection version >= 3.10.0)
 
 ### Databases
 
 For MariaDB, only Long Term releases are tested.
 
 - mysql 5.7.40 (collection version < 3.10.0)
-- mysql 8.0.31  (collection version < 3.10.0)
+- mysql 8.0.31 (collection version < 3.10.0)
+- mysql 8.4.1 (collection version >= 3.10.0) !!! FAILING, no support yet !!!
 - mariadb:10.3.34 (collection version < 3.5.1)
 - mariadb:10.4.24 (collection version >= 3.5.2, < 3.10.0)
 - mariadb:10.4.34 (collection version >= 3.10.0)

TESTING.md

@@ -87,16 +87,6 @@ The Makefile accept the following options
     - "1.1.1" <- pymysql
   - Description: The version of the python package of the connector to use. This value is used to filter tests meant for other connectors.
 
-- `python`
-  - Mandatory: true
-  - Choices:
-    - "3.8"
-    - "3.9"
-    - "3.10"
-    - "3.11"
-    - "3.12"
-  - Description: The python version to use in the controller (ansible-test container).
-
 - `target`
   - Mandatory: false
   - Choices:
@@ -123,23 +113,23 @@ tests will overwrite the 3 databases containers so no need to kill them in advan
 
 ```sh
 # Run all targets
-make ansible="stable-2.16" db_engine_name="mysql" db_engine_version="8.0.31" python="3.10" connector_name="pymysql" connector_version="1.0.2"
+make ansible="stable-2.16" db_engine_name="mysql" db_engine_version="8.0.31" connector_name="pymysql" connector_version="1.0.2"
 
 # A single target
-make ansible="stable-2.16" db_engine_name="mysql" db_engine_version="8.0.31" python="3.10" connector_name="pymysql" connector_version="1.0.2" target="test_mysql_info"
+make ansible="stable-2.16" db_engine_name="mysql" db_engine_version="8.0.31" connector_name="pymysql" connector_version="1.0.2" target="test_mysql_info"
 
 # Keep databases and ansible tests containers alives
 # A single target and continue on errors
-make ansible="stable-2.17" db_engine_name="mysql" db_engine_version="8.0.31" python="3.11" connector_name="mysqlclient" connector_version="2.0.3" target="test_mysql_query" keep_containers_alive=1 continue_on_errors=1
+make ansible="stable-2.17" db_engine_name="mysql" db_engine_version="8.0.31" connector_name="mysqlclient" connector_version="2.0.3" target="test_mysql_query" keep_containers_alive=1 continue_on_errors=1
 
 # If your system has an usupported version of Python:
-make local_python_version="3.10" ansible="stable-2.17" db_engine_name="mariadb" db_engine_version="10.6.11" python="3.11" connector_name="pymysql" connector_version="1.0.2"
+make local_python_version="3.10" ansible="stable-2.17" db_engine_name="mariadb" db_engine_version="10.6.11" connector_name="pymysql" connector_version="1.0.2"
 ```
 
 
 ### Run all tests
 
-GitHub Action offer a test matrix that run every combination of Python, MySQL, MariaDB and Connector against each other. To reproduce this, this repo provides a script called *run_all_tests.py*.
+GitHub Action offer a test matrix that run every combination of MySQL, MariaDB and Connector against each other. To reproduce this, this repo provides a script called *run_all_tests.py*.
 
 Examples:
 
@@ -148,8 +138,8 @@ python run_all_tests.py
 ```
 
 
-### Add a new Python, Connector or Database version
+### Add a new Connector or Database version
 
 New components version should be added to this file: [.github/workflows/ansible-test-plugins.yml](https://github.com/ansible-collections/community.mysql/tree/main/.github/workflows)
 
-Be careful to not add too much tests. When adding a new version of Python, for instance, only test it agains the latest versions of Ansible and MySQL/MariaDB. When tests are run, you can see that we already start 40 virtual machines!
+Be careful to not add too much tests. The matrix creates an exponential number of virtual machines!

tests/integration/targets/setup_controller/tasks/requirements.yml

@@ -1,14 +1,6 @@
 ---
 
-# (A) Ubuntu 20.04 has been updated on July 10th 2024 and now required
-# additionnal packages to connect to MySQL 8+. I think it was because of a
-# security issues discovered in mysql-client and/or PyMySQL. The error was:
-# unable to connect to database using pymysql 1.0.2, check login_user and
-# login_password are correct or /root/.my.cnf has the credentials. Exception
-# message: 'cryptography' package is required for sha256_password or
-# caching_sha2_password auth method
-# Ubuntu 20.04 is chosen by ansible-test default image. So any change in
-# ansible-test or Ubuntu can break our tests anytime without us knowing why.
+# We use the ubuntu2204 image provided by ansible-test.
 
 - name: "{{ role_name }} | Requirements | Install Linux packages"
   ansible.builtin.package:
@@ -21,12 +13,10 @@
       # different name between Ubuntu 20.04 and 22.04. Luckily, libmysql++ is
       # available on both.
       - "{{ 'libmysql++-dev' if db_engine == 'mysql' else 'libmariadb-dev' }}"
-      - python3-cryptography  # (A)
     state: present
 
 - name: "{{ role_name }} | Requirements | Install Python packages"
   ansible.builtin.pip:
     name:
-      - cffi  # (A)
       - "{{ connector_name }}=={{ connector_version }}"
     state: present

tests/integration/targets/setup_controller/tasks/setvars.yml

@@ -32,11 +32,6 @@
         'file',
         '/root/ansible_collections/community/mysql/tests/integration/db_engine_version'
       ) }}
-    python_version_lookup: >-
-      {{ lookup(
-        'file',
-        '/root/ansible_collections/community/mysql/tests/integration/python'
-      ) }}
     ansible_version_lookup: >-
       {{ lookup(
         'file',
@@ -49,7 +44,6 @@
     connector_version: "{{ connector_version_lookup.strip() }}"
     db_engine: "{{ db_engine_name_lookup.strip() }}"
     db_version: "{{ db_engine_version_lookup.strip() }}"
-    python_version: "{{ python_version_lookup.strip() }}"
     test_ansible_version: >-
       {%- if ansible_version_lookup == 'devel' -%}
       {{ ansible_version_lookup }}
@@ -77,7 +71,6 @@
       connector_version: {{ connector_version }}
       db_engine: {{ db_engine }}
       db_version: {{ db_version }}
-      python_version: {{ python_version }}
       test_ansible_version: {{ test_ansible_version }}
   ansible.builtin.debug:
     msg: "{{ msg.split('\n') }}"

tests/integration/targets/setup_controller/tasks/verify.yml

@@ -43,14 +43,8 @@
 
     - name: Display the python version in use
       command:
-        cmd: python{{ python_version }} -V
+        cmd: python -V
       changed_when: false
-      register: python_in_use
-
-    - name: Assert that expected Python is installed
-      assert:
-        that:
-          - python_in_use.stdout is search(python_version)
 
     - name: Assert that we run the expected ansible version
       assert: