Skip to content

Commit 3f2d08b

Browse files
Merge pull request #946 from lukaszstolarczuk/qemu-ubuntu
QEMU ubuntu fix & update
2 parents 38705d6 + 09daa84 commit 3f2d08b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/nightly.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,6 @@ jobs:
191191
uses: ./.github/workflows/reusable_qemu.yml
192192
with:
193193
short_run: false
194-
os: "['ubuntu-22.04', 'ubuntu-24.04']"
194+
# Beside the 2 LTS Ubuntu, we also test this on the latest Ubuntu - to be updated
195+
# every 6 months, so we verify the latest version of packages (compilers, etc.).
196+
os: "['ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-24.10']"

.github/workflows/reusable_qemu.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ jobs:
124124
ssh [email protected] -p 2222 -t "sudo chown -R testuser:users /home/testuser"
125125
126126
ssh [email protected] -p 2222 -t "bash /home/testuser/scripts/qemu/run-build.sh COVERAGE"
127-
ssh [email protected] -p 2222 -t "sudo shutdown -h now"
127+
# ssh may return non-zero error code on closing the connection in Ubuntu 22.04
128+
ssh [email protected] -p 2222 -t "sudo shutdown -h now" || true
128129
129130
- name: Run tests in QEMU
130131
run: |
@@ -143,7 +144,8 @@ jobs:
143144
144145
ssh [email protected] -p 2222 -t "export SHORT_RUN=${SHORT_RUN} OS_FULL_NAME=${{matrix.os}} && /home/testuser/scripts/qemu/run-tests.sh COVERAGE ${config_name}"
145146
scp -r -P 2222 [email protected]:/home/testuser/coverage ./
146-
ssh [email protected] -p 2222 -t "sudo shutdown -h now"
147+
# ssh may return non-zero error code on closing the connection in Ubuntu 22.04
148+
ssh [email protected] -p 2222 -t "sudo shutdown -h now" || true
147149
done
148150
ls -al ./coverage
149151

0 commit comments

Comments
 (0)