From bb84746650fa8407d3c6e036429d60a22d45f9b7 Mon Sep 17 00:00:00 2001 From: Andy Grunwald Date: Sat, 7 Sep 2024 15:39:55 +0200 Subject: [PATCH 1/4] minor: bump support for ansible from v2.16.* to v2.17.* Fix #386 Signed-off-by: Andy Grunwald --- meta/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/runtime.yml b/meta/runtime.yml index 09f57c217..ce208ee9a 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,2 +1,2 @@ --- -requires_ansible: ">=2.9.0,<=2.16.99" +requires_ansible: ">=2.9.0,<=2.17.99" From becdab3346be62946f11a28ce4a3583ede2f54fe Mon Sep 17 00:00:00 2001 From: Andy Grunwald Date: Sat, 7 Sep 2024 15:56:30 +0200 Subject: [PATCH 2/4] test: Fix shellcheck error SC2164 in `tests/integration/molecule.sh`for Ansible 2.17 Full error: ERROR: tests/integration/molecule.sh:54:1: SC2164: Use 'cd ... || exit' or 'cd ... || return' in case cd fails. Signed-off-by: Andy Grunwald --- tests/integration/molecule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/molecule.sh b/tests/integration/molecule.sh index 4a0cf5268..120021355 100755 --- a/tests/integration/molecule.sh +++ b/tests/integration/molecule.sh @@ -51,5 +51,5 @@ unset _ANSIBLE_COVERAGE_CONFIG unset ANSIBLE_PYTHON_INTERPRETER # Run molecule test -cd "$role_root" +cd "$role_root" || { echo "Fail to change directory into $role_root"; exit 1; } molecule -c "$collection_root/.config/molecule/config.yml" test -s "$scenario" From 2e51da8f43a247f46a596a8eb9a4a69de0c767f2 Mon Sep 17 00:00:00 2001 From: Andy Grunwald Date: Sat, 7 Sep 2024 16:15:28 +0200 Subject: [PATCH 3/4] fix: tell sanity test for Ansible v2.17 to ignore CI script shebang Signed-off-by: Andy Grunwald --- tests/sanity/ignore-2.17.txt | 1 + 1 file changed, 1 insertion(+) 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 000000000..fd1541b93 --- /dev/null +++ b/tests/sanity/ignore-2.17.txt @@ -0,0 +1 @@ +.github/scripts/collection_version_parser.py shebang # https://github.com/ansible/ansible/issues/78346 From e0d0aa4ba65f5c3fc23feefadd81609096972448 Mon Sep 17 00:00:00 2001 From: Andy Grunwald Date: Mon, 30 Sep 2024 07:36:59 +0200 Subject: [PATCH 4/4] fix: skip ansible 2.17 on almalinux-8 Signed-off-by: Andy Grunwald --- .config/molecule/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml index 8b9c8566e..0cc4680f2 100644 --- a/.config/molecule/config.yml +++ b/.config/molecule/config.yml @@ -88,3 +88,6 @@ provisioner: - "2.9" - "2.10" - "2.11" + almalinux-8: + exclude_ansible_vers: + - "2.17"