Skip to content

Commit 8c3c818

Browse files
Update test matrix with Ubuntu 24.04
1 parent 9f2d357 commit 8c3c818

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -205,26 +205,15 @@ jobs:
205205
- name: Debug
206206
run: sudo lxc exec test-container -- ip -4 -o link show
207207

208-
#- name: Install dhclient (Ubuntu 24.x)
209-
# run: sudo apt-get install -y isc-dhcp-client
210-
# #run: sudo apt-get -y install apt-file ; sudo apt-file update ; sudo apt-file search dhclient ; /bin/false
211-
# if: ${{ matrix.guest >= '24.04' }}
212-
213-
#- name: Install dhclient in container (Ubuntu 24.x)
214-
# run: sudo lxc exec test-container -- apt-get install -y isc-dhcp-client
215-
# if: ${{ matrix.guest >= '24.04' }}
216-
217-
#- name: Show dhclient
218-
# run: which dhclient ; ls -ld /sbin/dhclient* /usr/bin/dhclient* /usr/sbin/dhclient* ; /bin/false
219-
# #run: sudo apt-get -y install apt-file ; sudo apt-file update ; sudo apt-file search dhclient ; /bin/false
220-
# #if: ${{ matrix.guest >= '24.04' }}
221-
222208
- name: Store Container interface name
223209
run: echo "IF=$(sudo lxc exec test-container -- ip -4 -o link show | awk '{print $2}' | cut -f1 -d':' | cut -f1 -d'@' | grep '^e[tn]')" >> $GITHUB_OUTPUT
224210
id: test_container_interface
225211

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

230219
- name: Store Container IPv4 address
@@ -344,6 +333,9 @@ jobs:
344333
- name: Enable password login
345334
run: sudo lxc exec test-container -- sh -c 'sed -i "s/PasswordAuthentication no/PasswordAuthentication yes/" /etc/ssh/sshd_config.d/*'
346335

336+
- name: Reload OpenSSH
337+
run: sudo lxc exec test-container -- systemctl list-units | grep ssh
338+
347339
- name: Reload OpenSSH
348340
run: sudo lxc exec test-container -- systemctl reload sshd
349341

0 commit comments

Comments
 (0)