ubuntu_kernel_selftests: fix libnuma-dev install for s390x

Message ID 20170421094610.26526-1-kleber.souza@canonical.com
State New
Headers show

Commit Message

Kleber Sacilotto de Souza April 21, 2017, 9:46 a.m.
After commit 27a538cb64541c30cfb0b1e9cc42e1d03d0f5e30
(ubuntu_kernel_selftests: net tests require libnuma-dev), all
ubuntu_kernel_selftests are failing for s390x on series earlier than
Yakkety, since libnuma-dev is being built only from this series on.

Fix it by not installing the package when running older series on s390x.
Net tests are expected to continue failing though.

Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---
 ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Colin King April 21, 2017, 9:49 a.m. | #1
On 21/04/17 10:46, Kleber Sacilotto de Souza wrote:
> After commit 27a538cb64541c30cfb0b1e9cc42e1d03d0f5e30
> (ubuntu_kernel_selftests: net tests require libnuma-dev), all
> ubuntu_kernel_selftests are failing for s390x on series earlier than
> Yakkety, since libnuma-dev is being built only from this series on.
> 
> Fix it by not installing the package when running older series on s390x.
> Net tests are expected to continue failing though.
> 
> Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
> ---
>  ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> index 30e045df..2910fe29 100644
> --- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> +++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> @@ -12,8 +12,10 @@ class ubuntu_kernel_selftests(test.test):
>          series = platform.dist()[2]
>  
>          pkgs = [
> -            'build-essential', 'git', 'libnuma-dev'
> +            'build-essential', 'git'
>          ]
> +        if not (arch == 's390x' and series in ['precise', 'trusty', 'vivid', 'xenial']):
> +            pkgs.append('libnuma-dev')
>          gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
>          pkgs.append(gcc)
>  
> 
Seems like a suitable hack^H^H^H^H workaround to resolve this issue

Acked-by: Colin Ian King <colin.king@canonical.com>
Stefan Bader April 21, 2017, 10 a.m. | #2
On 21.04.2017 11:46, Kleber Sacilotto de Souza wrote:
> After commit 27a538cb64541c30cfb0b1e9cc42e1d03d0f5e30
> (ubuntu_kernel_selftests: net tests require libnuma-dev), all
> ubuntu_kernel_selftests are failing for s390x on series earlier than
> Yakkety, since libnuma-dev is being built only from this series on.
> 
> Fix it by not installing the package when running older series on s390x.
> Net tests are expected to continue failing though.
> 
> Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
> ---
>  ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> index 30e045df..2910fe29 100644
> --- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> +++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> @@ -12,8 +12,10 @@ class ubuntu_kernel_selftests(test.test):
>          series = platform.dist()[2]
>  
>          pkgs = [
> -            'build-essential', 'git', 'libnuma-dev'
> +            'build-essential', 'git'
>          ]
> +        if not (arch == 's390x' and series in ['precise', 'trusty', 'vivid', 'xenial']):
> +            pkgs.append('libnuma-dev')

Strictly speaking there is no s390x before Xenial but that is ok.

-Stefan

>          gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
>          pkgs.append(gcc)
>  
>
Brad Figg April 21, 2017, 10:14 p.m. | #3

Patch

diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
index 30e045df..2910fe29 100644
--- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
+++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
@@ -12,8 +12,10 @@  class ubuntu_kernel_selftests(test.test):
         series = platform.dist()[2]
 
         pkgs = [
-            'build-essential', 'git', 'libnuma-dev'
+            'build-essential', 'git'
         ]
+        if not (arch == 's390x' and series in ['precise', 'trusty', 'vivid', 'xenial']):
+            pkgs.append('libnuma-dev')
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib'
         pkgs.append(gcc)