From 0382cc65fea4ad75e8c2db9d3d91e6086a96fbff Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:22:40 +0200 Subject: [PATCH 1/5] test: remove all sanity ignore files --- tests/sanity/ignore-2.10.txt | 4 ---- tests/sanity/ignore-2.11.txt | 6 ------ tests/sanity/ignore-2.12.txt | 4 ---- tests/sanity/ignore-2.13.txt | 4 ---- tests/sanity/ignore-2.14.txt | 4 ---- tests/sanity/ignore-2.15.txt | 1 - tests/sanity/ignore-2.16.txt | 1 - tests/sanity/ignore-2.17.txt | 4 ---- tests/sanity/ignore-2.18.txt | 1 - tests/sanity/ignore-2.9.txt | 3 --- 10 files changed, 32 deletions(-) delete mode 100644 tests/sanity/ignore-2.10.txt delete mode 100644 tests/sanity/ignore-2.11.txt delete mode 100644 tests/sanity/ignore-2.12.txt delete mode 100644 tests/sanity/ignore-2.13.txt delete mode 100644 tests/sanity/ignore-2.14.txt delete mode 100644 tests/sanity/ignore-2.15.txt delete mode 100644 tests/sanity/ignore-2.16.txt delete mode 100644 tests/sanity/ignore-2.17.txt delete mode 100644 tests/sanity/ignore-2.18.txt delete mode 100644 tests/sanity/ignore-2.9.txt diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.10.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt deleted file mode 100644 index 68cb96ab..00000000 --- a/tests/sanity/ignore-2.11.txt +++ /dev/null @@ -1,6 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang -hacking/find_grafana_versions.py future-import-boilerplate!skip -hacking/find_grafana_versions.py metaclass-boilerplate!skip diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.12.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.13.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.14.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt deleted file mode 100644 index 0a40a23d..00000000 --- a/tests/sanity/ignore-2.15.txt +++ /dev/null @@ -1 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt deleted file mode 100644 index 0a40a23d..00000000 --- a/tests/sanity/ignore-2.16.txt +++ /dev/null @@ -1 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.17.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang diff --git a/tests/sanity/ignore-2.18.txt b/tests/sanity/ignore-2.18.txt deleted file mode 100644 index 0a40a23d..00000000 --- a/tests/sanity/ignore-2.18.txt +++ /dev/null @@ -1 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt deleted file mode 100644 index 476a7a42..00000000 --- a/tests/sanity/ignore-2.9.txt +++ /dev/null @@ -1,3 +0,0 @@ -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang From fdc11885a3f438918960ba7d762ec7b8dbaa7099 Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:23:48 +0200 Subject: [PATCH 2/5] ci: bump python to 3.12 --- .github/workflows/ansible-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index f32caf98..acf315dc 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - python_version: ["3.10"] + python_version: ["3.12"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] steps: - name: Perform testing @@ -29,7 +29,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - python_version: ["3.10"] + python_version: ["3.12"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] steps: - name: Perform testing @@ -47,7 +47,7 @@ jobs: matrix: grafana_version: ["8.5.27", "9.5.19", "10.4.3"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] - python_version: ["3.10"] + python_version: ["3.12"] services: grafana: image: grafana/grafana:${{ matrix.grafana_version }} @@ -69,7 +69,7 @@ jobs: matrix: grafana_version: ["8.5.27", "9.5.19", "10.4.3"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] - python_version: ["3.10"] + python_version: ["3.12"] services: grafana: image: grafana/grafana:${{ matrix.grafana_version }} From 26f23347d9e8f9ba814932590fa32d935430073f Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:28:35 +0200 Subject: [PATCH 3/5] docs: changelog fragment --- changelogs/fragments/373-cleanup-and-update-sanity.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/fragments/373-cleanup-and-update-sanity.yml diff --git a/changelogs/fragments/373-cleanup-and-update-sanity.yml b/changelogs/fragments/373-cleanup-and-update-sanity.yml new file mode 100644 index 00000000..c20a1253 --- /dev/null +++ b/changelogs/fragments/373-cleanup-and-update-sanity.yml @@ -0,0 +1,4 @@ +--- +trivial: + - bump python to 3.12 in ansible tests + - remove sanity ignore files From 57e986b0be3c7d04e2a6ece0499ba2291339dccc Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:39:43 +0200 Subject: [PATCH 4/5] ci: python to 3.11 --- .github/workflows/ansible-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index acf315dc..58405817 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - python_version: ["3.12"] + python_version: ["3.11"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] steps: - name: Perform testing @@ -29,7 +29,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - python_version: ["3.12"] + python_version: ["3.11"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] steps: - name: Perform testing @@ -47,7 +47,7 @@ jobs: matrix: grafana_version: ["8.5.27", "9.5.19", "10.4.3"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] - python_version: ["3.12"] + python_version: ["3.11"] services: grafana: image: grafana/grafana:${{ matrix.grafana_version }} @@ -69,7 +69,7 @@ jobs: matrix: grafana_version: ["8.5.27", "9.5.19", "10.4.3"] ansible_version: ["stable-2.15", "stable-2.16", "devel"] - python_version: ["3.12"] + python_version: ["3.11"] services: grafana: image: grafana/grafana:${{ matrix.grafana_version }} From b9bd2330cdcce2d6ceb2b157077117715e00609e Mon Sep 17 00:00:00 2001 From: Nemental <15136847+Nemental@users.noreply.github.com> Date: Tue, 28 May 2024 13:40:05 +0200 Subject: [PATCH 5/5] docs: update fragment --- changelogs/fragments/373-cleanup-and-update-sanity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/373-cleanup-and-update-sanity.yml b/changelogs/fragments/373-cleanup-and-update-sanity.yml index c20a1253..e5236485 100644 --- a/changelogs/fragments/373-cleanup-and-update-sanity.yml +++ b/changelogs/fragments/373-cleanup-and-update-sanity.yml @@ -1,4 +1,4 @@ --- trivial: - - bump python to 3.12 in ansible tests + - bump python to 3.11 in ansible tests - remove sanity ignore files