From: James Simmons Date: Mon, 30 Apr 2018 17:41:35 +0000 (-0400) Subject: LU-10575 build: make lustre-test dpkg depend on mpi-default-dev X-Git-Tag: 2.11.52~18 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=212e35bebef55339979cff9edfb3581249b2df32 LU-10575 build: make lustre-test dpkg depend on mpi-default-dev Currently Ubuntu testing fails to run MPI based applications in the lustre test suite. This is due improper dpkg setup. The solution is to make lustre-test to depend on mp-default-dev meta-package which will pull MPICH or OpenMPI depending on the platform. Test-Parameters: trivial testlist=performance-sanity clientdistro=ubuntu1604 Change-Id: I6b162d4d7b2485289d3e1c4dc23bcd6263fee682 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/32179 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Wei Liu Reviewed-by: Thomas Stibor Reviewed-by: Oleg Drokin --- diff --git a/debian/control b/debian/control index c8a2a35..57cf797 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Brian J. Murrell Uploaders: Brian J. Murrell Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>=7.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync +Build-Depends: module-assistant, libreadline-dev, debhelper (>=7.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync Homepage: https://wiki.hpdd.intel.com/ Vcs-Git: git://git.hpdd.intel.com/fs/lustre-release.git @@ -12,7 +12,7 @@ Package: lustre-source Section: admin Architecture: all Priority: optional -Depends: module-assistant, bzip2, debhelper (>= 7.0.0), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, dpatch +Depends: module-assistant, bzip2, debhelper (>= 7.0.0), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, dpatch Description: source for Lustre filesystem client kernel modules Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Intel Corporation and available from @@ -70,7 +70,7 @@ Package: lustre-tests Section: utils Architecture: i386 powerpc ppc64el amd64 ia64 arm64 Priority: optional -Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof +Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin Description: Test suite for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Intel Corporation and available from diff --git a/debian/control.main b/debian/control.main index c8a2a35..57cf797 100644 --- a/debian/control.main +++ b/debian/control.main @@ -4,7 +4,7 @@ Priority: optional Maintainer: Brian J. Murrell Uploaders: Brian J. Murrell Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>=7.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync +Build-Depends: module-assistant, libreadline-dev, debhelper (>=7.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, libtool, libyaml-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers | linux-headers-amd64, rsync Homepage: https://wiki.hpdd.intel.com/ Vcs-Git: git://git.hpdd.intel.com/fs/lustre-release.git @@ -12,7 +12,7 @@ Package: lustre-source Section: admin Architecture: all Priority: optional -Depends: module-assistant, bzip2, debhelper (>= 7.0.0), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, dpatch +Depends: module-assistant, bzip2, debhelper (>= 7.0.0), libtool, libyaml-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, dpatch Description: source for Lustre filesystem client kernel modules Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Intel Corporation and available from @@ -70,7 +70,7 @@ Package: lustre-tests Section: utils Architecture: i386 powerpc ppc64el amd64 ia64 arm64 Priority: optional -Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof +Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin Description: Test suite for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Intel Corporation and available from