From 5eb353f39a0d44a65f3b2cb95fb9d0b55d2a5107 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 9 Jun 2025 10:27:27 -0600 Subject: [PATCH 1/2] ci: Use ansible 2.19 for fedora 42 testing; support python 3.13 NOTE: This also requires upgrading to tox-lsr 3.11.0 Ansible 2.19 will be released soon and has some changes which will require fixes in system roles. This adds 2.19 to our testing matrix on fedora 42 so that we can start addressing these issues. python 3.13 is now being used on some platforms. Signed-off-by: Rich Megginson --- .github/workflows/ansible-lint.yml | 2 +- .github/workflows/ansible-managed-var-comment.yml | 2 +- .github/workflows/ansible-test.yml | 2 +- .github/workflows/python-unit-test.yml | 4 +++- .github/workflows/qemu-kvm-integration-tests.yml | 4 ++-- .github/workflows/tft.yml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 9ada1d04..337f8699 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.10.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0" - name: Convert role to collection format id: collection diff --git a/.github/workflows/ansible-managed-var-comment.yml b/.github/workflows/ansible-managed-var-comment.yml index f38380c6..c9ebafe9 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.10.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 977fc72b..bbe1f6cf 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.10.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0" - name: Convert role to collection format run: | diff --git a/.github/workflows/python-unit-test.yml b/.github/workflows/python-unit-test.yml index 48e50a16..8c27635b 100644 --- a/.github/workflows/python-unit-test.yml +++ b/.github/workflows/python-unit-test.yml @@ -29,6 +29,8 @@ jobs: os: ubuntu-latest - ver: "3.12" os: ubuntu-latest + - ver: "3.13" + os: ubuntu-latest runs-on: ${{ matrix.pyver_os.os }} steps: - name: Update git @@ -65,7 +67,7 @@ jobs: tox=tox virtualenv=virtualenv fi - pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.10.0" + pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.11.0" # If you have additional OS dependency packages e.g. libcairo2-dev # then put them in .github/config/ubuntu-requirements.txt, one # package per line. diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index 4554a6ce..886f6dc0 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -29,7 +29,7 @@ jobs: - { image: "centos-10", env: "qemu-ansible-core-2.17" } # ansible/libdnf5 bug: https://issues.redhat.com/browse/RHELMISC-10110 # - { image: "fedora-41", env: "qemu-ansible-core-2.17" } - - { image: "fedora-42", env: "qemu-ansible-core-2.17" } + - { image: "fedora-42", env: "qemu-ansible-core-2.19" } # container - { image: "centos-9", env: "container-ansible-core-2.16" } @@ -105,7 +105,7 @@ jobs: python3 -m pip install --upgrade pip sudo apt update sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86 - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.10.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0" # HACK: Drop this when moving this workflow to 26.04 LTS - name: Update podman to 5.x for compatibility with bootc-image-builder's podman 5 diff --git a/.github/workflows/tft.yml b/.github/workflows/tft.yml index 9a38c0b7..39b13299 100644 --- a/.github/workflows/tft.yml +++ b/.github/workflows/tft.yml @@ -101,7 +101,7 @@ jobs: - platform: Fedora-41 ansible_version: 2.17 - platform: Fedora-42 - ansible_version: 2.17 + ansible_version: 2.19 - platform: CentOS-7-latest ansible_version: 2.9 - platform: CentOS-Stream-8 From b169b88fb767737d15fb3da8ba888500f110df39 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 9 Jun 2025 16:27:28 -0600 Subject: [PATCH 2/2] ci: Use ansible 2.19 for fedora 42 testing; support python 3.13 NOTE: This also requires upgrading to tox-lsr 3.11.0 Ansible 2.19 will be released soon and has some changes which will require fixes in system roles. This adds 2.19 to our testing matrix on fedora 42 so that we can start addressing these issues. python 3.13 is now being used on some platforms. Using ansible-core 2.18 requires using py311 for pylint and other python checkers. Signed-off-by: Rich Megginson --- .github/workflows/python-unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-unit-test.yml b/.github/workflows/python-unit-test.yml index 8c27635b..39da5937 100644 --- a/.github/workflows/python-unit-test.yml +++ b/.github/workflows/python-unit-test.yml @@ -83,7 +83,7 @@ jobs: # NOTE: The use of flake8, pylint, black with specific # python envs is arbitrary and must be changed in tox-lsr case "$toxpyver" in - 310) toxenvs="${toxenvs},coveralls,flake8,pylint,black" ;; + 311) toxenvs="${toxenvs},coveralls,flake8,pylint,black" ;; *) toxenvs="${toxenvs},coveralls" ;; esac TOXENV="$toxenvs" lsr_ci_runtox