| Message ID | 20240528004211.564010-2-npiggin@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/qtest/migration-test: Improve and enable on ppc64 | expand |
On 28/05/2024 02.42, Nicholas Piggin wrote: > As Fabiano points out, this test isn't flaky it just can't run under > gitlab CI since runners have a very small shm size. > > Suggested-by: Fabiano Rosas <farosas@suse.de> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > tests/qtest/migration-test.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index b7e3406471..04bf1c0092 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -706,6 +706,14 @@ static int test_migrate_start(QTestState **from, QTestState **to, > g_test_skip("/dev/shm is not supported"); > return -1; > } > + if (getenv("GITLAB_CI")) { > + /* > + * Gitlab runners are limited to 64MB shm size. See: > + * https://lore.kernel.org/all/87ttq5fvh7.fsf@suse.de/ > + */ > + g_test_skip("/dev/shm is not supported in Gitlab CI environment"); > + return -1; > + } > } Note that there is more than gitlab-CI: We can also run tests on Travis (well, hardly anybody beside me is still doing that) or other constraints container environments ... so it might be better to check whether enough space is available than to tie this to an environment variable (or even better change away from /dev/shm if possible like you did in your other patch - but I don't have a clue whether that's ok or not for these tests) Thomas
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index b7e3406471..04bf1c0092 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -706,6 +706,14 @@ static int test_migrate_start(QTestState **from, QTestState **to, g_test_skip("/dev/shm is not supported"); return -1; } + if (getenv("GITLAB_CI")) { + /* + * Gitlab runners are limited to 64MB shm size. See: + * https://lore.kernel.org/all/87ttq5fvh7.fsf@suse.de/ + */ + g_test_skip("/dev/shm is not supported in Gitlab CI environment"); + return -1; + } } dst_state = (QTestMigrationState) { }; @@ -3506,15 +3514,7 @@ int main(int argc, char **argv) test_precopy_file_offset); migration_test_add("/migration/precopy/file/offset/bad", test_precopy_file_offset_bad); - - /* - * Our CI system has problems with shared memory. - * Don't run this test until we find a workaround. - */ - if (getenv("QEMU_TEST_FLAKY_TESTS")) { - migration_test_add("/migration/mode/reboot", test_mode_reboot); - } - + migration_test_add("/migration/mode/reboot", test_mode_reboot); migration_test_add("/migration/precopy/file/mapped-ram", test_precopy_file_mapped_ram); migration_test_add("/migration/precopy/file/mapped-ram/live",
As Fabiano points out, this test isn't flaky it just can't run under gitlab CI since runners have a very small shm size. Suggested-by: Fabiano Rosas <farosas@suse.de> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- tests/qtest/migration-test.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)