summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-28 15:56:47 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-29 14:10:50 +0200
commitd12fedd25ea35f17584066e6d3a3e5884e1d2890 (patch)
tree60d9ef7142ec53c393e5d95387f6a7e649094fb1
parenttest: Run tests that don't need a vm in systemd-nspawn (diff)
downloadsystemd-d12fedd25ea35f17584066e6d3a3e5884e1d2890.tar.xz
systemd-d12fedd25ea35f17584066e6d3a3e5884e1d2890.zip
mkosi: Run integration tests as root
This allows running integration tests that support it in nspawn instead of qemu. This both gives extra coverage and speeds things up.
-rw-r--r--.github/workflows/mkosi.yml2
-rw-r--r--test/TEST-85-NETWORK/meson.build1
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 140828166b..be5f1edfee 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -182,7 +182,7 @@ jobs:
run: meson compile -C build mkosi
- name: Run integration tests
- run: meson test -C build --no-rebuild --suite integration-tests --print-errorlogs --no-stdsplit --num-processes "$(($(nproc) - 1))"
+ run: sudo meson test -C build --no-rebuild --suite integration-tests --print-errorlogs --no-stdsplit --num-processes "$(($(nproc) - 1))"
- name: Archive failed test journals
uses: actions/upload-artifact@v4
diff --git a/test/TEST-85-NETWORK/meson.build b/test/TEST-85-NETWORK/meson.build
index 629275883c..47ec02940e 100644
--- a/test/TEST-85-NETWORK/meson.build
+++ b/test/TEST-85-NETWORK/meson.build
@@ -25,6 +25,7 @@ foreach testcase : network_testcases
'systemd.setenv=TEST_MATCH_TESTCASE=@0@'.format(testcase)
],
'priority' : 10,
+ 'vm' : true,
},
]
endforeach