From 1d480143f972125d4a595c7c87d4d7ad5c90dd44 Mon Sep 17 00:00:00 2001 From: Helena Greebe Date: Thu, 20 Feb 2025 09:48:12 -0500 Subject: [PATCH 1/2] Do not install lustre on ubuntu2404 --- .../resources/lustre/partial/_install_lustre_debian.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb b/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb index 78a7b13149..13a797c7f8 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb @@ -14,6 +14,7 @@ # See the License for the specific language governing permissions and limitations under the License. action :setup do + return if node['platform_version'].to_i == 24 apt_repository 'fsxlustreclientrepo' do uri "https://fsx-lustre-client-repo.s3.amazonaws.com/ubuntu" components ['main'] From bc3670afe056d6233c38dec036581298f633a3a5 Mon Sep 17 00:00:00 2001 From: Helena Greebe Date: Thu, 20 Feb 2025 10:24:33 -0500 Subject: [PATCH 2/2] Fix jq spec test failure die to deprecation of --argfile --- .../test/controls/install_packages_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/aws-parallelcluster-platform/test/controls/install_packages_spec.rb b/cookbooks/aws-parallelcluster-platform/test/controls/install_packages_spec.rb index 647580b985..75dfb00abc 100644 --- a/cookbooks/aws-parallelcluster-platform/test/controls/install_packages_spec.rb +++ b/cookbooks/aws-parallelcluster-platform/test/controls/install_packages_spec.rb @@ -17,7 +17,7 @@ # Verify jq version is updated enough to accept 2 argfile parameters describe bash("jq --argfile") do its('stderr') { should match /jq: --argfile takes two parameters/ } - end unless instance.custom_ami? || os_properties.alinux2023? + end unless instance.custom_ami? || os_properties.alinux2023? || os_properties.ubuntu2404? # Need to change the jq --argfile commands as its deprecated in 1.7( latest) unless os_properties.centos7?