From ac636226d563a65023aa86d0cfdde5c36e2bf8fc Mon Sep 17 00:00:00 2001 From: Enrico Usai Date: Mon, 27 Nov 2023 11:12:56 +0100 Subject: [PATCH] Temporary skip installation and test of lustre client on rhel/rocky on docker Latest dokken/rockylinux-8 image is 8.9 and there is no Lustre client available for it. We're temporary skipping installation and check, until lustre is avail. ### References https://docs.aws.amazon.com/fsx/latest/LustreGuide/install-lustre-client.html Signed-off-by: Enrico Usai --- .../resources/lustre/partial/_install_lustre_centos_redhat.rb | 4 +++- .../test/controls/lustre_spec.rb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_centos_redhat.rb b/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_centos_redhat.rb index ebcd4e4bf6..f61f0c4392 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_centos_redhat.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_centos_redhat.rb @@ -28,10 +28,12 @@ command "yum-config-manager --setopt=\*.skip_if_unavailable=1 --save" end + # TODO: restore installation on docker when Lustre is available for RH8.9 + # See: https://docs.aws.amazon.com/fsx/latest/LustreGuide/install-lustre-client.html package %w(kmod-lustre-client lustre-client dracut) do retries 3 retry_delay 5 - end + end unless redhat_on_docker? || rocky_on_docker? kernel_module 'lnet' unless redhat_on_docker? || rocky_on_docker? end diff --git a/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb b/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb index 3b49305ef0..febd780050 100644 --- a/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb +++ b/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb @@ -27,7 +27,9 @@ end end - if os_properties.redhat? && inspec.os.release.to_f >= 8.2 + if os_properties.redhat? && inspec.os.release.to_f >= 8.2 && !os_properties.on_docker? + # TODO: restore installation and check on docker when Lustre is available for RH8.9 + # See: https://docs.aws.amazon.com/fsx/latest/LustreGuide/install-lustre-client.html unless inspec.os.release.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7")) describe package('kmod-lustre-client') do it { should be_installed }