Skip to content

Commit 6d1061f

Browse files
committed
ci: Add support for Fedora 44 and drop Fedora 42 - use ansible-core 2.21 [citest_skip]
It's time to test with F44 and drop F42. Use ansible-core 2.21 for testing - this is now the latest stable version. Deprecate podman 5 install hack in favor of official github action Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent bcf42e5 commit 6d1061f

5 files changed

Lines changed: 25 additions & 29 deletions

File tree

.github/workflows/ansible-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Install tox, tox-lsr
4545
run: |
4646
set -euxo pipefail
47-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.0"
47+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1"
4848
4949
- name: Set up Python
5050
uses: actions/setup-python@v6

.github/workflows/ansible-managed-var-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install tox, tox-lsr
3434
run: |
3535
set -euxo pipefail
36-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1"
3737
3838
- name: Run ansible-plugin-scan
3939
run: |

.github/workflows/ansible-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Install tox, tox-lsr
4848
run: |
4949
set -euxo pipefail
50-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.0"
50+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1"
5151
5252
- name: Set up Python
5353
uses: actions/setup-python@v6

.github/workflows/qemu-kvm-integration-tests.yml

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
# QEMU
3131
- { image: "centos-9", env: "qemu-ansible-core-2-16" }
3232
- { image: "centos-10", env: "qemu-ansible-core-2-17" }
33-
- { image: "fedora-42", env: "qemu-ansible-core-2-19" }
3433
- { image: "fedora-43", env: "qemu-ansible-core-2-20" }
34+
- { image: "fedora-44", env: "qemu-ansible-core-2-21" }
3535
- { image: "leap-15.6", env: "qemu-ansible-core-2-18" }
3636

3737
# container
@@ -40,10 +40,11 @@ jobs:
4040
# broken on non-running dbus
4141
# - { image: "centos-10", env: "container-ansible-core-2-17" }
4242
- { image: "centos-10-bootc", env: "container-ansible-core-2-17" }
43-
- { image: "fedora-42", env: "container-ansible-core-2-17" }
4443
- { image: "fedora-43", env: "container-ansible-core-2-20" }
45-
- { image: "fedora-42-bootc", env: "container-ansible-core-2-17" }
44+
- { image: "fedora-44", env: "container-ansible-core-2-21" }
4645
- { image: "fedora-43-bootc", env: "container-ansible-core-2-20" }
46+
# ansible-core 2.21 cannot enable services using service module in bootc images
47+
- { image: "fedora-44-bootc", env: "container-ansible-core-2-20" }
4748

4849
env:
4950
TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi"
@@ -110,29 +111,24 @@ jobs:
110111
python3 -m pip install --upgrade pip
111112
sudo apt update
112113
sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86
113-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.0"
114+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.20.1"
114115
115-
# HACK: Drop this when moving this workflow to 26.04 LTS
116-
- name: Update podman to 5.x for compatibility with bootc-image-builder's podman 5
117-
if: steps.check_platform.outputs.supported && endsWith(matrix.scenario.image, '-bootc')
116+
- name: Check for podman version 5 or higher
117+
id: check_podman_version
118+
if: steps.check_platform.outputs.supported
118119
run: |
119-
sed 's/noble/plucky/g' /etc/apt/sources.list.d/ubuntu.sources | sudo tee /etc/apt/sources.list.d/plucky.sources >/dev/null
120-
cat <<EOF | sudo tee /etc/apt/preferences.d/podman.pref >/dev/null
121-
Package: podman buildah golang-github-containers-common crun libgpgme11t64 libgpg-error0 golang-github-containers-image catatonit conmon containers-storage
122-
Pin: release n=plucky
123-
Pin-Priority: 991
124-
125-
Package: libsubid4 netavark passt aardvark-dns containernetworking-plugins libslirp0 slirp4netns
126-
Pin: release n=plucky
127-
Pin-Priority: 991
128-
129-
Package: *
130-
Pin: release n=plucky
131-
Pin-Priority: 400
132-
EOF
120+
podman_version=$(podman version -f '{{.Client.Version}}')
121+
podman_major_version="${podman_version%%.*}"
122+
echo "Podman version: $podman_version"
123+
if [ "$podman_major_version" -lt 5 ]; then
124+
echo "need_podman_update=1" >> "$GITHUB_OUTPUT"
125+
else
126+
echo "need_podman_update=0" >> "$GITHUB_OUTPUT"
127+
fi
133128
134-
sudo apt update
135-
sudo apt install -y podman crun conmon containers-storage
129+
- name: Ensure use of podman 5
130+
if: steps.check_platform.outputs.supported && steps.check_podman_version.outputs.need_podman_update == 1
131+
uses: redhat-actions/podman-install@main
136132

137133
- name: Configure tox-lsr
138134
if: steps.check_platform.outputs.supported

.github/workflows/tft.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
meta_main=meta/main.yml
7373
# All Fedora are supported, add latest Fedora versions to supported_platforms
7474
if yq '.galaxy_info.galaxy_tags[]' "$meta_main" | grep -qi fedora$; then
75-
supported_platforms+=" Fedora-42"
7675
supported_platforms+=" Fedora-43"
76+
supported_platforms+=" Fedora-44"
7777
fi
7878
# Specific Fedora versions supported
7979
if yq '.galaxy_info.galaxy_tags[]' "$meta_main" | grep -qiP 'fedora\d+$'; then
@@ -99,10 +99,10 @@ jobs:
9999
matrix:
100100
include:
101101
# Ensure ansible version is a string!
102-
- platform: Fedora-42
103-
ansible_version: "2.19"
104102
- platform: Fedora-43
105103
ansible_version: "2.20"
104+
- platform: Fedora-44
105+
ansible_version: "2.21"
106106
- platform: CentOS-7-latest
107107
ansible_version: "2.9"
108108
- platform: CentOS-Stream-8

0 commit comments

Comments
 (0)