Merge branch 'develop' into develop

Author: hgreebe

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']

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?