| Message ID | 20190117185628.21862-18-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Acceptance Tests: target architecture support | expand |
On Thu, 17 Jan 2019 13:56:27 -0500 Cleber Rosa <crosa@redhat.com> wrote: > Just like the previous tests, boots a Linux kernel on a s390x target > using the s390-ccw-virtio machine. > > Because it's not possible to have multiple VT220 consoles, > '-nodefaults' is used, so that the one set with set_console() works > correctly. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > .travis.yml | 2 +- > tests/acceptance/boot_linux_console.py | 20 ++++++++++++++++++++ > 2 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/.travis.yml b/.travis.yml > index ea7c9828ac..0d5a4b104b 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -187,7 +187,7 @@ matrix: > > # Acceptance (Functional) tests > - env: > - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-softmmu" > + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu" > - TEST_CMD="make check-acceptance" > addons: > apt: > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index 00aee3114e..c4d5477d45 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -177,3 +177,23 @@ class BootLinuxConsole(Test): > self.vm.launch() > console_pattern = 'Kernel command line: %s' % kernel_command_line > self.wait_for_console_pattern(console_pattern) > + > + def test_s390x_s390_ccw_virtio(self): > + """ > + :avocado: tags=arch:s390x > + :avocado: tags=machine:s390_ccw_virtio > + """ > + kernel_url = ('http://mirrors.rit.edu/fedora/fedora-secondary/releases' > + '/29/Server/s390x/os/images/kernel.img') > + kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313' > + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > + > + self.vm.set_machine('s390-ccw-virtio') > + self.vm.set_console() > + kernel_command_line = 'console=sclp0' > + self.vm.add_args('-nodefaults', > + '-kernel', kernel_path, > + '-append', kernel_command_line) > + self.vm.launch() > + console_pattern = 'Kernel command line: %s' % kernel_command_line > + self.wait_for_console_pattern(console_pattern) Cool, I had been looking at adding some of the tests I'm running here to this framework as well, and this gives me a good base to work with :) I'll try to find some time to give it a whirl.
On 1/18/19 3:58 AM, Cornelia Huck wrote: > > Cool, I had been looking at adding some of the tests I'm running here > to this framework as well, and this gives me a good base to work with :) > > I'll try to find some time to give it a whirl. > I can't assist you in finding some time, but for anything else, please ping me :) Cheers, - Cleber.
On Thu, Jan 17, 2019 at 01:56:27PM -0500, Cleber Rosa wrote: > Just like the previous tests, boots a Linux kernel on a s390x target > using the s390-ccw-virtio machine. > > Because it's not possible to have multiple VT220 consoles, > '-nodefaults' is used, so that the one set with set_console() works > correctly. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Caio Carrara <ccarrara@redhat.com> > --- > .travis.yml | 2 +- > tests/acceptance/boot_linux_console.py | 20 ++++++++++++++++++++ > 2 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/.travis.yml b/.travis.yml > index ea7c9828ac..0d5a4b104b 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -187,7 +187,7 @@ matrix: > > # Acceptance (Functional) tests > - env: > - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-softmmu" > + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu" > - TEST_CMD="make check-acceptance" > addons: > apt: > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index 00aee3114e..c4d5477d45 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -177,3 +177,23 @@ class BootLinuxConsole(Test): > self.vm.launch() > console_pattern = 'Kernel command line: %s' % kernel_command_line > self.wait_for_console_pattern(console_pattern) > + > + def test_s390x_s390_ccw_virtio(self): > + """ > + :avocado: tags=arch:s390x > + :avocado: tags=machine:s390_ccw_virtio > + """ > + kernel_url = ('http://mirrors.rit.edu/fedora/fedora-secondary/releases' > + '/29/Server/s390x/os/images/kernel.img') > + kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313' > + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > + > + self.vm.set_machine('s390-ccw-virtio') > + self.vm.set_console() > + kernel_command_line = 'console=sclp0' > + self.vm.add_args('-nodefaults', > + '-kernel', kernel_path, > + '-append', kernel_command_line) > + self.vm.launch() > + console_pattern = 'Kernel command line: %s' % kernel_command_line > + self.wait_for_console_pattern(console_pattern) > -- > 2.20.1 >
diff --git a/.travis.yml b/.travis.yml index ea7c9828ac..0d5a4b104b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -187,7 +187,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-softmmu" + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu" - TEST_CMD="make check-acceptance" addons: apt: diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 00aee3114e..c4d5477d45 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -177,3 +177,23 @@ class BootLinuxConsole(Test): self.vm.launch() console_pattern = 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) + + def test_s390x_s390_ccw_virtio(self): + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390_ccw_virtio + """ + kernel_url = ('http://mirrors.rit.edu/fedora/fedora-secondary/releases' + '/29/Server/s390x/os/images/kernel.img') + kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + self.vm.set_machine('s390-ccw-virtio') + self.vm.set_console() + kernel_command_line = 'console=sclp0' + self.vm.add_args('-nodefaults', + '-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern = 'Kernel command line: %s' % kernel_command_line + self.wait_for_console_pattern(console_pattern)
Just like the previous tests, boots a Linux kernel on a s390x target using the s390-ccw-virtio machine. Because it's not possible to have multiple VT220 consoles, '-nodefaults' is used, so that the one set with set_console() works correctly. Signed-off-by: Cleber Rosa <crosa@redhat.com> --- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-)