| Message ID | 20190221134101.13903-1-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tests/cdrom-test: only include isapc cdrom test when g_test_slow() | expand |
On 21/02/2019 14.41, Alex Bennée wrote: > We are seeing instability on our CI runs which has been there since > the test was introduced. I suspect it triggers more on Travis due to > their heavy load. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/cdrom-test.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c > index 14bd981336..05611da648 100644 > --- a/tests/cdrom-test.c > +++ b/tests/cdrom-test.c > @@ -132,8 +132,14 @@ static void add_x86_tests(void) > qtest_add_data_func("cdrom/boot/virtio-scsi", > "-device virtio-scsi -device scsi-cd,drive=cdr " > "-blockdev file,node-name=cdr,filename=", test_cdboot); > - qtest_add_data_func("cdrom/boot/isapc", "-M isapc " > - "-drive if=ide,media=cdrom,file=", test_cdboot); > + /* > + * Unstable CI test under load > + * See https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg05509.html > + */ > + if (g_test_slow()) { > + qtest_add_data_func("cdrom/boot/isapc", "-M isapc " > + "-drive if=ide,media=cdrom,file=", test_cdboot); > + } > qtest_add_data_func("cdrom/boot/am53c974", > "-device am53c974 -device scsi-cd,drive=cd1 " > "-drive if=none,id=cd1,format=raw,file=", test_cdboot); > Acked-by: Thomas Huth <thuth@redhat.com> Which tree should this go through? qtest? Block? Your test tree? At least I don't have much in the qtest queue right now and did not plan a pull request soon. Let me know if you want me to queue it.
Thomas Huth <thuth@redhat.com> writes: > On 21/02/2019 14.41, Alex Bennée wrote: >> We are seeing instability on our CI runs which has been there since >> the test was introduced. I suspect it triggers more on Travis due to >> their heavy load. >> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> tests/cdrom-test.c | 10 ++++++++-- >> 1 file changed, 8 insertions(+), 2 deletions(-) >> >> diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c >> index 14bd981336..05611da648 100644 >> --- a/tests/cdrom-test.c >> +++ b/tests/cdrom-test.c >> @@ -132,8 +132,14 @@ static void add_x86_tests(void) >> qtest_add_data_func("cdrom/boot/virtio-scsi", >> "-device virtio-scsi -device scsi-cd,drive=cdr " >> "-blockdev file,node-name=cdr,filename=", test_cdboot); >> - qtest_add_data_func("cdrom/boot/isapc", "-M isapc " >> - "-drive if=ide,media=cdrom,file=", test_cdboot); >> + /* >> + * Unstable CI test under load >> + * See https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg05509.html >> + */ >> + if (g_test_slow()) { >> + qtest_add_data_func("cdrom/boot/isapc", "-M isapc " >> + "-drive if=ide,media=cdrom,file=", test_cdboot); >> + } >> qtest_add_data_func("cdrom/boot/am53c974", >> "-device am53c974 -device scsi-cd,drive=cd1 " >> "-drive if=none,id=cd1,format=raw,file=", test_cdboot); >> > > Acked-by: Thomas Huth <thuth@redhat.com> > > Which tree should this go through? qtest? Block? Your test tree? I'll put in my testing/next pull-req. > > At least I don't have much in the qtest queue right now and did not plan > a pull request soon. Let me know if you want me to queue it. -- Alex Bennée
diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c index 14bd981336..05611da648 100644 --- a/tests/cdrom-test.c +++ b/tests/cdrom-test.c @@ -132,8 +132,14 @@ static void add_x86_tests(void) qtest_add_data_func("cdrom/boot/virtio-scsi", "-device virtio-scsi -device scsi-cd,drive=cdr " "-blockdev file,node-name=cdr,filename=", test_cdboot); - qtest_add_data_func("cdrom/boot/isapc", "-M isapc " - "-drive if=ide,media=cdrom,file=", test_cdboot); + /* + * Unstable CI test under load + * See https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg05509.html + */ + if (g_test_slow()) { + qtest_add_data_func("cdrom/boot/isapc", "-M isapc " + "-drive if=ide,media=cdrom,file=", test_cdboot); + } qtest_add_data_func("cdrom/boot/am53c974", "-device am53c974 -device scsi-cd,drive=cd1 " "-drive if=none,id=cd1,format=raw,file=", test_cdboot);
We are seeing instability on our CI runs which has been there since the test was introduced. I suspect it triggers more on Travis due to their heavy load. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/cdrom-test.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.20.1