| Message ID | 20190607152223.9467-5-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Miscellaneous acceptance test and Travis CI improvements | expand |
Hi Cleber, On 06/07/2019 12:22 PM, Cleber Rosa wrote: > Just like the previous tests, boots a Linux kernel on a ppc64 target > using the pseries machine. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > Reviewed-by: Caio Carrara <ccarrara@redhat.com> > CC: Daniel P. Berrangé <berrange@redhat.com> > --- > .travis.yml | 2 +- > tests/acceptance/boot_linux_console.py | 19 +++++++++++++++++++ > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/.travis.yml b/.travis.yml > index 9f8e73f276..5592e458ab 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -224,7 +224,7 @@ matrix: > > # Acceptance (Functional) tests > - env: > - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu" > + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc64-softmmu" > - TEST_CMD="make check-acceptance" > after_failure: > - cat tests/results/latest/job.log > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index d5c500ea30..a196636367 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -217,3 +217,22 @@ class BootLinuxConsole(Test): > self.vm.launch() > console_pattern = 'Kernel command line: %s' % kernel_command_line > self.wait_for_console_pattern(console_pattern) > + > + def test_ppc64_pseries(self): > + """ > + :avocado: tags=arch:ppc64 > + :avocado: tags=machine:pseries > + """ > + kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/' > + 'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz') > + kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' > + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > + > + self.vm.set_machine('pseries') > + self.vm.set_console() > + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0' > + self.vm.add_args('-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) I'm refactoring the acceptance tests which boot a Linux Kernel so that they can share common functions. My latest implementation [1] was re-based on this patch, and it would help manage my contribution if we could merge this very soon. Anyway, tested this patch on my Fedora 30 x86_64 machine. Passed. Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> [1] https://github.com/wainersm/qemu/tree/acceptance_boot_linux
diff --git a/.travis.yml b/.travis.yml index 9f8e73f276..5592e458ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -224,7 +224,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu" + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc64-softmmu" - TEST_CMD="make check-acceptance" after_failure: - cat tests/results/latest/job.log diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index d5c500ea30..a196636367 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -217,3 +217,22 @@ class BootLinuxConsole(Test): self.vm.launch() console_pattern = 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) + + def test_ppc64_pseries(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + """ + kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/' + 'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz') + kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + self.vm.set_machine('pseries') + self.vm.set_console() + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0' + self.vm.add_args('-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)