Skip to content

Commit 5eae74c

Browse files
Update test matrix with Ubuntu 24.04 (#62)
1 parent 421cf20 commit 5eae74c

File tree

1 file changed

+30
-22
lines changed

1 file changed

+30
-22
lines changed

.github/workflows/test.yml

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,7 @@ jobs:
2929
# build the matrix manually - not all versions of Ubuntu can do with all Ansible versions,
3030
# mostly because the Python version is outdated (20.04 only has Python 3.8)
3131
# maybe in the future this can be build with include/exclude
32-
#os: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest]
33-
#ansible: ["stable-2.9", "stable-2.10", "stable-2.11", "stable-2.12", "stable-2.13", "stable-2.14"]
3432
include:
35-
- os: ubuntu-20.04
36-
guest: 20.04
37-
#guest-image: 20.04/amd64
38-
ansible: "stable-2.9"
39-
- os: ubuntu-20.04
40-
guest: 20.04
41-
ansible: "stable-2.10"
42-
- os: ubuntu-20.04
43-
guest: 20.04
44-
ansible: "stable-2.11"
45-
- os: ubuntu-20.04
46-
guest: 20.04
47-
ansible: "stable-2.12"
48-
- os: ubuntu-20.04
49-
guest: 20.04
50-
ansible: "stable-2.13"
5133
- os: ubuntu-22.04
5234
guest: 22.04
5335
ansible: "stable-2.9"
@@ -66,13 +48,33 @@ jobs:
6648
- os: ubuntu-22.04
6749
guest: 22.04
6850
ansible: "stable-2.14"
51+
52+
- os: ubuntu-24.04
53+
guest: 24.04
54+
ansible: "stable-2.13"
55+
- os: ubuntu-24.04
56+
guest: 24.04
57+
ansible: "stable-2.14"
58+
- os: ubuntu-24.04
59+
guest: 24.04
60+
ansible: "stable-2.15"
61+
- os: ubuntu-24.04
62+
guest: 24.04
63+
ansible: "stable-2.16"
64+
- os: ubuntu-24.04
65+
guest: 24.04
66+
ansible: "stable-2.17"
67+
- os: ubuntu-24.04
68+
guest: 24.04
69+
ansible: "stable-2.18"
70+
6971
# build the latest known stable Ansible on the latest known stable Ubuntu
7072
- os: ubuntu-latest
71-
guest: 22.04
72-
ansible: "stable-2.14"
73+
guest: 24.04
74+
ansible: "stable-2.18"
7375
# build the development version of Ansible on latest Ubuntu
7476
- os: ubuntu-latest
75-
guest: 22.04
77+
guest: 24.04
7678
ansible: "devel"
7779

7880
steps:
@@ -194,7 +196,11 @@ jobs:
194196
id: test_container_interface
195197

196198
- name: Request and wait for IPv4 address
197-
run: sudo lxc exec test-container -- dhclient -v ${{ steps.test_container_interface.outputs.IF }}
199+
run: sudo lxc exec test-container -- /usr/sbin/dhclient -v ${{ steps.test_container_interface.outputs.IF }}
200+
# apparently this is working out of the box in 24.04
201+
# also no need to install dhclient anymore
202+
# in earlier versions the network address from LXC was not readily available
203+
if: ${{ matrix.guest < '24.04' }}
198204

199205
- name: Store Container IPv4 address
200206
run: echo "IPv4=$(sudo lxc exec test-container -- ip -o -4 addr show ${{ steps.test_container_interface.outputs.IF }} | awk '{print $4}' | cut -d/ -f1)" >> $GITHUB_OUTPUT
@@ -315,6 +321,8 @@ jobs:
315321

316322
- name: Reload OpenSSH
317323
run: sudo lxc exec test-container -- systemctl reload sshd
324+
# in 24.04 ssh is socket activated (by systemd)
325+
if: ${{ matrix.guest < '24.04' }}
318326

319327
- name: Install sshpass on runner
320328
run: sudo apt-get -y install sshpass

0 commit comments

Comments
 (0)