Skip to content

Commit 345b848

Browse files
committed
TEST IGNORE --cxl-test-run
1 parent 878a7a7 commit 345b848

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

.github/workflows/main.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
img_distro: ubuntu
3636
img_rel: noble
3737
arch: [x86_64]
38-
run_opts: [--cxl-test --ndctl-build]
38+
run_opts: [--cxl-test-run --ndctl-build]
3939

4040
steps:
4141
- uses: actions/checkout@v4
@@ -53,9 +53,17 @@ jobs:
5353
5454
# run_qemu deps
5555
sudo apt install -y mkosi # this one pulls A LOT
56-
sudo apt install -y dracut-core qemu-utils ovmf mtools
56+
sudo apt install -y dracut-core qemu-utils ovmf mtools qemu-system-x86
5757
pip3 install qemu.qmp
5858
59+
# This is required on a plain Ubuntu system but is blocked on Github runners.
60+
# sudo usermod -a -G kvm $(id -u -n)
61+
62+
# This Ubuntu 22.04 file disappeared in Ubuntu 24.04, no idea why.
63+
# FIXME: make run_qemu.sh#get_ovmf_binaries() smarter and more flexible.
64+
test -e /usr/share/OVMF/OVMF_CODE.fd ||
65+
sudo ln -s /usr/share/OVMF/OVMF_CODE_4M.fd OVMF_CODE.fd
66+
5967
- name: mkosi v20 fixes
6068
if: matrix.cfg.os == 'ubuntu-24.04'
6169
run: |
@@ -157,7 +165,7 @@ jobs:
157165
PATH=/usr/lib/ccache:"$PATH" \
158166
distro=${{ matrix.cfg.img_distro }} rev=${{ matrix.cfg.img_rel }} \
159167
ndctl='${{ github.workspace }}'/ndctl \
160-
../run_qemu/run_qemu.sh -v --no-run ${{ matrix.run_opts }}
168+
../run_qemu/run_qemu.sh -v ${{ matrix.run_opts }}
161169
162170
- name: ccache stats post build
163171
run: |

0 commit comments

Comments
 (0)