Message ID | 20201102144245.2134077-2-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | [PATCH-for-5.2?,1/5] tests/acceptance: Restrict virtio_check_params tests to X86 target | expand |
ping? On 11/2/20 3:42 PM, Philippe Mathieu-Daudé wrote: > We disabled the virtio_check_params tests in commit 2d6a6e238a2 > ("tests/acceptance/virtio_check_params: Disable the test"), > because these tests were making multiarch CI fail (virtio is > multiarch). > > We took the big hammer, as we can restrict the tests to the X86 > arch. Restore them on this single arch. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/acceptance/virtio_check_params.py | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py > index 87e6c839d14..fecf1c094b1 100644 > --- a/tests/acceptance/virtio_check_params.py > +++ b/tests/acceptance/virtio_check_params.py > @@ -42,6 +42,12 @@ > > > class VirtioMaxSegSettingsCheck(Test): > + """ > + This test should be multi-arch, however only X86 is implemented. > + > + :avocado: tags=arch:x86_64 > + """ > + > @staticmethod > def make_pattern(props): > pattern_items = ['{0} = \w+'.format(prop) for prop in props] > @@ -117,7 +123,6 @@ def seg_max_adjust_enabled(mt): > return True > return False > > - @skip("break multi-arch CI") > def test_machine_types(self): > # collect all machine types except 'none', 'isapc', 'microvm' > with QEMUMachine(self.qemu_bin) as vm: >
On Mon, Nov 2, 2020 at 11:45 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > We disabled the virtio_check_params tests in commit 2d6a6e238a2 > ("tests/acceptance/virtio_check_params: Disable the test"), > because these tests were making multiarch CI fail (virtio is > multiarch). > > We took the big hammer, as we can restrict the tests to the X86 > arch. Restore them on this single arch. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/acceptance/virtio_check_params.py | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py > index 87e6c839d14..fecf1c094b1 100644 > --- a/tests/acceptance/virtio_check_params.py > +++ b/tests/acceptance/virtio_check_params.py > @@ -42,6 +42,12 @@ > > > class VirtioMaxSegSettingsCheck(Test): > + """ > + This test should be multi-arch, however only X86 is implemented. > + > + :avocado: tags=arch:x86_64 > + """ > + > @staticmethod > def make_pattern(props): > pattern_items = ['{0} = \w+'.format(prop) for prop in props] > @@ -117,7 +123,6 @@ def seg_max_adjust_enabled(mt): > return True > return False > > - @skip("break multi-arch CI") > def test_machine_types(self): > # collect all machine types except 'none', 'isapc', 'microvm' > with QEMUMachine(self.qemu_bin) as vm: > -- > 2.26.2 > > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 87e6c839d14..fecf1c094b1 100644 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -42,6 +42,12 @@ class VirtioMaxSegSettingsCheck(Test): + """ + This test should be multi-arch, however only X86 is implemented. + + :avocado: tags=arch:x86_64 + """ + @staticmethod def make_pattern(props): pattern_items = ['{0} = \w+'.format(prop) for prop in props] @@ -117,7 +123,6 @@ def seg_max_adjust_enabled(mt): return True return False - @skip("break multi-arch CI") def test_machine_types(self): # collect all machine types except 'none', 'isapc', 'microvm' with QEMUMachine(self.qemu_bin) as vm:
We disabled the virtio_check_params tests in commit 2d6a6e238a2 ("tests/acceptance/virtio_check_params: Disable the test"), because these tests were making multiarch CI fail (virtio is multiarch). We took the big hammer, as we can restrict the tests to the X86 arch. Restore them on this single arch. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- tests/acceptance/virtio_check_params.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)