From 24689b3864a97c47dea946158abd7deae5965f6e Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Tue, 19 Sep 2023 15:08:44 +0200 Subject: [PATCH 1/6] Add stable-2.15 and 2.16 now that devel link to 2.17 --- .github/workflows/ansible-test-plugins.yml | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml index 6533f946..f3a31640 100644 --- a/.github/workflows/ansible-test-plugins.yml +++ b/.github/workflows/ansible-test-plugins.yml @@ -25,6 +25,8 @@ jobs: - stable-2.12 - stable-2.13 - stable-2.14 + - stable-2.15 + - stable-2.16 - devel steps: - name: Perform sanity testing @@ -44,6 +46,8 @@ jobs: - stable-2.12 - stable-2.13 - stable-2.14 + - stable-2.15 + - stable-2.16 - devel db_engine_name: - mysql @@ -117,6 +121,12 @@ jobs: - db_engine_version: 5.7.40 ansible: stable-2.14 + - db_engine_version: 5.7.40 + ansible: stable-2.15 + + - db_engine_version: 5.7.40 + ansible: stable-2.16 + - db_engine_version: 5.7.40 ansible: devel @@ -177,12 +187,24 @@ jobs: - python: '3.8' ansible: stable-2.14 + - python: '3.8' + ansible: stable-2.15 + + - python: '3.8' + ansible: stable-2.16 + - python: '3.8' ansible: devel - python: '3.9' ansible: stable-2.12 + - python: '3.9' + ansible: stable-2.15 + + - python: '3.9' + ansible: stable-2.16 + - python: '3.9' ansible: devel @@ -337,6 +359,8 @@ jobs: - stable-2.12 - stable-2.13 - stable-2.14 + - stable-2.15 + - stable-2.16 - devel python: - 3.8 @@ -346,6 +370,10 @@ jobs: ansible: stable-2.13 - python: '3.8' ansible: stable-2.14 + - python: '3.8' + ansible: stable-2.15 + - python: '3.8' + ansible: stable-2.16 - python: '3.8' ansible: devel - python: '3.9' From 4da82e0f86a17bf0636e33c7408c88f01aa9adc6 Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Tue, 19 Sep 2023 15:17:09 +0200 Subject: [PATCH 2/6] document which ansible-core version we support --- README.md | 8 +++++--- TESTING.md | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b0244533..f7e062ce 100644 --- a/README.md +++ b/README.md @@ -82,9 +82,11 @@ Here is the table for the support timeline: ### ansible-core -- 2.12 -- 2.13 -- 2.14 +- stable-2.12 +- stable-2.13 +- stable-2.14 +- stable-2.15 +- stable-2.16 - current development version ### Databases diff --git a/TESTING.md b/TESTING.md index 7bbafc31..7025391e 100644 --- a/TESTING.md +++ b/TESTING.md @@ -52,6 +52,8 @@ The Makefile accept the following options - "stable-2.12" - "stable-2.13" - "stable-2.14" + - "stable-2.15" + - "stable-2.16" - "devel" - Description: Version of ansible to install in a venv to run ansible-test From e6d62cb3ab89dcb956247bc9aed939e69b325b99 Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Fri, 22 Sep 2023 09:33:51 +0200 Subject: [PATCH 3/6] add sanity ignore for ansible-core 2.17 --- tests/sanity/ignore-2.17.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tests/sanity/ignore-2.17.txt diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt new file mode 100644 index 00000000..da0354c9 --- /dev/null +++ b/tests/sanity/ignore-2.17.txt @@ -0,0 +1,10 @@ +plugins/modules/mysql_db.py validate-modules:doc-elements-mismatch +plugins/modules/mysql_db.py validate-modules:parameter-list-no-elements +plugins/modules/mysql_db.py validate-modules:use-run-command-not-popen +plugins/modules/mysql_info.py validate-modules:doc-elements-mismatch +plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements +plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements +plugins/modules/mysql_user.py validate-modules:undocumented-parameter +plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch +plugins/module_utils/mysql.py pylint:unused-import +plugins/module_utils/version.py pylint:unused-import From 4dcbca71da510af547b966151bd79d73c6c9c2a5 Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Tue, 26 Sep 2023 10:18:40 +0200 Subject: [PATCH 4/6] cut sanity ignore for 2.12 and 2.13 --- tests/sanity/ignore-2.12.txt | 8 -------- tests/sanity/ignore-2.13.txt | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 tests/sanity/ignore-2.12.txt delete mode 100644 tests/sanity/ignore-2.13.txt diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt deleted file mode 100644 index c0323aff..00000000 --- a/tests/sanity/ignore-2.12.txt +++ /dev/null @@ -1,8 +0,0 @@ -plugins/modules/mysql_db.py validate-modules:doc-elements-mismatch -plugins/modules/mysql_db.py validate-modules:parameter-list-no-elements -plugins/modules/mysql_db.py validate-modules:use-run-command-not-popen -plugins/modules/mysql_info.py validate-modules:doc-elements-mismatch -plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements -plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements -plugins/modules/mysql_user.py validate-modules:undocumented-parameter -plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt deleted file mode 100644 index c0323aff..00000000 --- a/tests/sanity/ignore-2.13.txt +++ /dev/null @@ -1,8 +0,0 @@ -plugins/modules/mysql_db.py validate-modules:doc-elements-mismatch -plugins/modules/mysql_db.py validate-modules:parameter-list-no-elements -plugins/modules/mysql_db.py validate-modules:use-run-command-not-popen -plugins/modules/mysql_info.py validate-modules:doc-elements-mismatch -plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements -plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements -plugins/modules/mysql_user.py validate-modules:undocumented-parameter -plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch From 5562de5779c5fccc97dd33ec14b94b870e1ee6ce Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Wed, 27 Sep 2023 17:27:34 +0200 Subject: [PATCH 5/6] Add change log fragment --- .../fragments/drop_ansible_core_2_12_and_2_13.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 changelogs/fragments/drop_ansible_core_2_12_and_2_13.yml diff --git a/changelogs/fragments/drop_ansible_core_2_12_and_2_13.yml b/changelogs/fragments/drop_ansible_core_2_12_and_2_13.yml new file mode 100644 index 00000000..29a363e9 --- /dev/null +++ b/changelogs/fragments/drop_ansible_core_2_12_and_2_13.yml @@ -0,0 +1,11 @@ +--- + +major_changes: + + - The community.mysql collection no longer supports ``ansible-core 2.12`` and + ``ansible-core 2.13``. While we take no active measures to prevent usage + and there are no plans to introduce incompatible code to the modules, we + will stop testing those versions. Both are or will soon be End of Life and + if you are still using them, you should consider upgrading to the + ``latest Ansible / ansible-core 2.15 or later`` as soon as possible + (https://github.com/ansible-collections/community.mysql/pull/574). From 167a1dda6ba6ae9bfc917a0b3841cb851de8dbf6 Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Wed, 27 Sep 2023 17:35:43 +0200 Subject: [PATCH 6/6] Cut ansible-core 2.12 and 2.13 from GHA test matrix --- .github/workflows/ansible-test-plugins.yml | 22 ---------------------- .github/workflows/ansible-test-roles.yml | 19 ++----------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml index f3a31640..78644bb2 100644 --- a/.github/workflows/ansible-test-plugins.yml +++ b/.github/workflows/ansible-test-plugins.yml @@ -22,8 +22,6 @@ jobs: strategy: matrix: ansible: - - stable-2.12 - - stable-2.13 - stable-2.14 - stable-2.15 - stable-2.16 @@ -43,8 +41,6 @@ jobs: fail-fast: false matrix: ansible: - - stable-2.12 - - stable-2.13 - stable-2.14 - stable-2.15 - stable-2.16 @@ -115,9 +111,6 @@ jobs: - db_engine_version: 5.7.40 python: '3.10' - - db_engine_version: 5.7.40 - ansible: stable-2.13 - - db_engine_version: 5.7.40 ansible: stable-2.14 @@ -181,9 +174,6 @@ jobs: - python: '3.10' connector_version: 2.0.3 - - python: '3.8' - ansible: stable-2.13 - - python: '3.8' ansible: stable-2.14 @@ -196,9 +186,6 @@ jobs: - python: '3.8' ansible: devel - - python: '3.9' - ansible: stable-2.12 - - python: '3.9' ansible: stable-2.15 @@ -208,9 +195,6 @@ jobs: - python: '3.9' ansible: devel - - python: '3.10' - ansible: stable-2.12 - services: db_primary: image: docker.io/library/${{ matrix.db_engine_name }}:${{ matrix.db_engine_version }} @@ -356,8 +340,6 @@ jobs: fail-fast: true matrix: ansible: - - stable-2.12 - - stable-2.13 - stable-2.14 - stable-2.15 - stable-2.16 @@ -366,8 +348,6 @@ jobs: - 3.8 - 3.9 exclude: - - python: '3.8' - ansible: stable-2.13 - python: '3.8' ansible: stable-2.14 - python: '3.8' @@ -376,8 +356,6 @@ jobs: ansible: stable-2.16 - python: '3.8' ansible: devel - - python: '3.9' - ansible: stable-2.12 steps: - name: >- diff --git a/.github/workflows/ansible-test-roles.yml b/.github/workflows/ansible-test-roles.yml index 13e7d417..da8a805c 100644 --- a/.github/workflows/ansible-test-roles.yml +++ b/.github/workflows/ansible-test-roles.yml @@ -24,31 +24,16 @@ jobs: mysql: - 2.0.12 ansible: - - stable-2.11 - - stable-2.12 - stable-2.13 + - stable-2.14 + - stable-2.15 - devel python: - - 3.6 - 3.8 - 3.9 exclude: - - python: 3.6 - ansible: stable-2.12 - - python: 3.6 - ansible: stable-2.13 - - python: 3.6 - ansible: devel - - python: 3.8 - ansible: stable-2.11 - - python: 3.8 - ansible: stable-2.13 - python: 3.8 ansible: devel - - python: 3.9 - ansible: stable-2.11 - - python: 3.9 - ansible: stable-2.12 steps: