diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 271b191..2ac0ffe 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -44,7 +44,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1" - name: Set up Python uses: actions/setup-python@v6 diff --git a/.github/workflows/ansible-managed-var-comment.yml b/.github/workflows/ansible-managed-var-comment.yml index 8fb10f8..a2127cd 100644 --- a/.github/workflows/ansible-managed-var-comment.yml +++ b/.github/workflows/ansible-managed-var-comment.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.20.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 8f9ad80..03b3b03 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -47,7 +47,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1" - name: Set up Python uses: actions/setup-python@v6 diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index 3c8c331..318b7e4 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -30,8 +30,8 @@ jobs: # QEMU - { image: "centos-9", env: "qemu-ansible-core-2-16" } - { image: "centos-10", env: "qemu-ansible-core-2-17" } - - { image: "fedora-42", env: "qemu-ansible-core-2-19" } - { image: "fedora-43", env: "qemu-ansible-core-2-20" } + - { image: "fedora-44", env: "qemu-ansible-core-2-21" } - { image: "leap-15.6", env: "qemu-ansible-core-2-18" } # container @@ -40,10 +40,11 @@ jobs: # broken on non-running dbus # - { image: "centos-10", env: "container-ansible-core-2-17" } - { image: "centos-10-bootc", env: "container-ansible-core-2-17" } - - { image: "fedora-42", env: "container-ansible-core-2-17" } - { image: "fedora-43", env: "container-ansible-core-2-20" } - - { image: "fedora-42-bootc", env: "container-ansible-core-2-17" } + - { image: "fedora-44", env: "container-ansible-core-2-21" } - { image: "fedora-43-bootc", env: "container-ansible-core-2-20" } + # ansible-core 2.21 cannot enable services using service module in bootc images + - { image: "fedora-44-bootc", env: "container-ansible-core-2-20" } env: TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi" @@ -110,29 +111,24 @@ 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.20.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1" - # 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 - if: steps.check_platform.outputs.supported && endsWith(matrix.scenario.image, '-bootc') + - name: Check for podman version 5 or higher + id: check_podman_version + if: steps.check_platform.outputs.supported run: | - sed 's/noble/plucky/g' /etc/apt/sources.list.d/ubuntu.sources | sudo tee /etc/apt/sources.list.d/plucky.sources >/dev/null - cat </dev/null - Package: podman buildah golang-github-containers-common crun libgpgme11t64 libgpg-error0 golang-github-containers-image catatonit conmon containers-storage - Pin: release n=plucky - Pin-Priority: 991 - - Package: libsubid4 netavark passt aardvark-dns containernetworking-plugins libslirp0 slirp4netns - Pin: release n=plucky - Pin-Priority: 991 - - Package: * - Pin: release n=plucky - Pin-Priority: 400 - EOF + podman_version=$(podman version -f '{{.Client.Version}}') + podman_major_version="${podman_version%%.*}" + echo "Podman version: $podman_version" + if [ "$podman_major_version" -lt 5 ]; then + echo "need_podman_update=1" >> "$GITHUB_OUTPUT" + else + echo "need_podman_update=0" >> "$GITHUB_OUTPUT" + fi - sudo apt update - sudo apt install -y podman crun conmon containers-storage + - name: Ensure use of podman 5 + if: steps.check_platform.outputs.supported && steps.check_podman_version.outputs.need_podman_update == 1 + uses: redhat-actions/podman-install@main - name: Configure tox-lsr if: steps.check_platform.outputs.supported diff --git a/.github/workflows/tft.yml b/.github/workflows/tft.yml index cb227aa..cb9960c 100644 --- a/.github/workflows/tft.yml +++ b/.github/workflows/tft.yml @@ -72,8 +72,8 @@ jobs: meta_main=meta/main.yml # All Fedora are supported, add latest Fedora versions to supported_platforms if yq '.galaxy_info.galaxy_tags[]' "$meta_main" | grep -qi fedora$; then - supported_platforms+=" Fedora-42" supported_platforms+=" Fedora-43" + supported_platforms+=" Fedora-44" fi # Specific Fedora versions supported if yq '.galaxy_info.galaxy_tags[]' "$meta_main" | grep -qiP 'fedora\d+$'; then @@ -99,10 +99,10 @@ jobs: matrix: include: # Ensure ansible version is a string! - - platform: Fedora-42 - ansible_version: "2.19" - platform: Fedora-43 ansible_version: "2.20" + - platform: Fedora-44 + ansible_version: "2.21" - platform: CentOS-7-latest ansible_version: "2.9" - platform: CentOS-Stream-8