Skip to content

Commit d586522

Browse files
hanwen-clusterhanwen-pcluste
authored andcommitted
Packages installation changes for RHEL8, RHEL9, Rocky8, Rocky9
Remove `pyparted`, `redhat-lsb`, `python2`, `python2-pip` installations because they are not available in RHEL9 and Rocky9. Add perl, dbus-devel installation because they were part of `redhat-lsb` and are dependencies of Slurm We are doing the same on RHEL8, RHEL9, Rocky8, Rocky9 to keep consistencies across OSes. Reference: pyparted: https://github.com/dcantrell/pyparted redhat-lsb: https://access.redhat.com/solutions/6973382 perl: https://www.perl.org dbus-devel: https://packages.fedoraproject.org/pkgs/dbus/dbus-devel/ Signed-off-by: Hanwen <[email protected]>
1 parent dbe10f6 commit d586522

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_redhat8.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ def default_packages
2424
# Removed libssh2-devel from base_packages since is not shipped by RedHat 8 and in conflict with package libssh-0.9.6-3.el8.x86_64
2525
# iptables needed for IMDS setup
2626
%w(vim ksh tcsh zsh openssl-devel ncurses-devel pam-devel net-tools openmotif-devel
27-
libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf pyparted libtool
28-
httpd boost-devel redhat-lsb mlocate R atlas-devel
27+
libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf libtool
28+
httpd boost-devel mlocate R atlas-devel
2929
blas-devel libffi-devel dkms libedit-devel jq
3030
libical-devel sendmail libxml2-devel libglvnd-devel
31-
python2 python2-pip libgcrypt-devel libevent-devel glibc-static bind-utils
31+
libgcrypt-devel libevent-devel glibc-static bind-utils
3232
iproute NetworkManager-config-routing-rules python3 python3-pip iptables libcurl-devel yum-plugin-versionlock
3333
coreutils moreutils curl environment-modules gcc gcc-c++ bzip2)
3434
end

cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_rocky8.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ def default_packages
4848
# environment-modules required by EFA, Intel MPI and ARM PL
4949
# iptables needed for IMDS setup
5050
packages = %w(vim ksh tcsh zsh openssl-devel ncurses-devel pam-devel net-tools openmotif-devel
51-
libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf pyparted libtool
52-
httpd boost-devel redhat-lsb mlocate R atlas-devel
51+
libXmu-devel hwloc-devel libdb-devel tcl-devel automake autoconf libtool
52+
httpd boost-devel mlocate R atlas-devel
5353
blas-devel libffi-devel dkms libedit-devel jq
5454
libical-devel sendmail libxml2-devel libglvnd-devel
55-
python2 python2-pip libgcrypt-devel libevent-devel glibc-static bind-utils
55+
libgcrypt-devel libevent-devel glibc-static bind-utils
5656
iproute NetworkManager-config-routing-rules python3 python3-pip iptables libcurl-devel yum-plugin-versionlock
5757
moreutils curl environment-modules gcc gcc-c++ bzip2)
5858
packages.append("coreutils") unless on_docker? # on docker image coreutils conflict with coreutils-single, already installed on it

cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_redhat8.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
use 'partial/_slurm_dependencies_common'
1616

1717
def dependencies
18-
%w(json-c-devel http-parser-devel perl-Switch lua-devel)
18+
%w(json-c-devel http-parser-devel lua-devel perl dbus-devel)
1919
end

cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_rocky8.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
use 'partial/_slurm_dependencies_common'
1616

1717
def dependencies
18-
%w(json-c-devel http-parser-devel perl-Switch lua-devel)
18+
%w(json-c-devel http-parser-devel lua-devel perl dbus-devel)
1919
end

cookbooks/aws-parallelcluster-slurm/test/controls/slurm_dependencies_spec.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ def lua_devel_package
2424

2525
packages = []
2626
if os.redhat?
27-
# Skipping redhat on docker since ubi-appstream repo is not aligned with the main repo
28-
packages.concat %w(json-c-devel http-parser-devel perl-Switch) unless os_properties.redhat_on_docker?
27+
if os_properties.alinux2? || os_properties.centos7?
28+
# Skipping redhat on docker since ubi-appstream repo is not aligned with the main repo
29+
packages.concat %w(json-c-devel http-parser-devel perl-Switch) unless os_properties.redhat_on_docker?
30+
else
31+
packages.concat %w(json-c-devel http-parser-devel perl dbus-devel) unless os_properties.redhat_on_docker?
32+
end
2933
elsif os.debian?
3034
packages.concat %w(libjson-c-dev libhttp-parser-dev libswitch-perl)
3135
else

0 commit comments

Comments
 (0)