From eb027b622f0ba8a072fe7ee655b49fcb8c6a3a92 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 3 Jun 2024 10:27:49 -0600 Subject: [PATCH 1/2] ci: tox-lsr 3.4.0 - fix py27 tests; move other checks to py310 The latest version of virtualenv does not support creating python 2.7 virtualenvs. Change our CI tests to restrict the version of virtualenv<20.22.0 and tox<4.15 for py27 environments Move pylint, flake8, and black checks to the py310 environment which is currently supported by ansible-core 2.17 and its related checkers such as ansible-lint and ansible-test pylint now uses ansible-core 2.17 and restricts the version of pylint to 3.1.0 which is the version used by ansible-test 2.17 Remove `extends: default` for .yamllint.yml. The latest version of ansible-lint will automatically incorporate local yamllint settings unless there is an `extends:`. The above changes require some fixes to the role code. For more information, see https://github.com/linux-system-roles/tox-lsr/pull/168 and https://github.com/linux-system-roles/tox-lsr/pull/170 Signed-off-by: Rich Megginson --- .github/workflows/ansible-lint.yml | 2 +- .github/workflows/ansible-managed-var-comment.yml | 2 +- .github/workflows/ansible-plugin-scan.yml | 2 +- .github/workflows/ansible-test.yml | 2 +- .yamllint.yml | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index be9419d6..ac13e1f3 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -32,7 +32,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.3.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.4.0" - name: Convert role to collection format run: | diff --git a/.github/workflows/ansible-managed-var-comment.yml b/.github/workflows/ansible-managed-var-comment.yml index fcfef957..0864269d 100644 --- a/.github/workflows/ansible-managed-var-comment.yml +++ b/.github/workflows/ansible-managed-var-comment.yml @@ -30,7 +30,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.3.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.4.0" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-plugin-scan.yml b/.github/workflows/ansible-plugin-scan.yml index 844d7350..987448f8 100644 --- a/.github/workflows/ansible-plugin-scan.yml +++ b/.github/workflows/ansible-plugin-scan.yml @@ -30,7 +30,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.3.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.4.0" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 2018b46f..c2b2351d 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -33,7 +33,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.3.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.4.0" - name: Convert role to collection format run: | diff --git a/.yamllint.yml b/.yamllint.yml index 96072339..f37db65f 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -1,5 +1,4 @@ # SPDX-License-Identifier: MIT --- -extends: default ignore: | /.tox/ From 6482fb64f7e66463f2cf5889a7ceff082e7615c6 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 3 Jun 2024 13:15:07 -0600 Subject: [PATCH 2/2] fix ansible-lint octal value issues --- tests/tests_quadlet_demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_quadlet_demo.yml b/tests/tests_quadlet_demo.yml index a719f9c4..259a6947 100644 --- a/tests/tests_quadlet_demo.yml +++ b/tests/tests_quadlet_demo.yml @@ -98,7 +98,7 @@ get_url: url: https://localhost:8000 dest: /run/out - mode: 0600 + mode: "0600" validate_certs: false register: __web_status until: __web_status is success