Upgrade nfs third-party cookbook to version nfs-5.1.2 (from nfs-5.0.0)

Version 5.0.1 introduced support for Ubuntu22, anyway we weren't able to upgrade the package because nfs-utils `1:2.6.1-1ubuntu1.2` wasn't correctly supported. I created a patch for nfs cookbook to fix this incompatibility issue with nfs-utils. This has been released, so we can now upgrade to 5.1.x and remove the `ubuntu.22.json` file. ### References * https://github.com/sous-chefs/nfs/releases * sous-chefs/nfs#142 * https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1971935 Signed-off-by: Enrico Usai <[email protected]>
hgreebe · Nov 16, 2023 · 139fe2a · 139fe2a
1 parent 41e1b48
commit 139fe2a
Show file tree

Hide file tree

Showing 76 changed files with 316 additions and 5,125 deletions.
diff --git a/Berksfile b/Berksfile
@@ -10,7 +10,7 @@ metadata
 cookbook "apt", path: "./cookbooks/third-party/apt-7.5.14"
 cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0"
 cookbook "line", path: "./cookbooks/third-party/line-4.5.13"
-cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0"
+cookbook "nfs", path: "./cookbooks/third-party/nfs-5.1.2"
 cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3"
 cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3"
 cookbook "selinux", path: "./cookbooks/third-party/selinux-6.1.12"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@ aws-parallelcluster-cookbook CHANGELOG
 
 This file is used to list changes made in each version of the AWS ParallelCluster cookbook.
 
+3.9.0
+------
+
+**ENHANCEMENTS**
+
+**CHANGES**
+- Upgrade third-party cookbook dependencies:
+  - nfs-5.1.2 (from nfs-5.0.0)
+
+**BUG FIXES**
+
 3.8.0
 ------
 

diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile
@@ -15,7 +15,7 @@ cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
 cookbook "apt", path: "../third-party/apt-7.5.14"
 cookbook "iptables", path: "../third-party/iptables-8.0.0"
 cookbook "line", path: "../third-party/line-4.5.13"
-cookbook "nfs", path: "../third-party/nfs-5.0.0"
+cookbook "nfs", path: "../third-party/nfs-5.1.2"
 cookbook "openssh", path: "../third-party/openssh-2.11.3"
 cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
 cookbook "selinux", path: "../third-party/selinux-6.1.12"

diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb
@@ -15,7 +15,7 @@
 
 depends 'apt', '~> 7.5.14'
 depends 'iptables', '~> 8.0.0'
-depends 'nfs', '~> 5.0.0'
+depends 'nfs', '~> 5.1.2'
 depends 'line', '~> 4.5.13'
 depends 'openssh', '~> 2.11.3'
 depends 'pyenv', '~> 4.2.3'

diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile
@@ -12,7 +12,7 @@ cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
 cookbook "apt", path: "../third-party/apt-7.5.14"
 cookbook "iptables", path: "../third-party/iptables-8.0.0"
 cookbook "line", path: "../third-party/line-4.5.13"
-cookbook "nfs", path: "../third-party/nfs-5.0.0"
+cookbook "nfs", path: "../third-party/nfs-5.1.2"
 cookbook "openssh", path: "../third-party/openssh-2.11.3"
 cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
 cookbook "selinux", path: "../third-party/selinux-6.1.12"

diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile
@@ -4,7 +4,7 @@ metadata
 
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
-cookbook "nfs", path: "../third-party/nfs-5.0.0"
+cookbook "nfs", path: "../third-party/nfs-5.1.2"
 
 # dependency od nfs
 cookbook "line", path: "../third-party/line-4.5.13"

diff --git a/cookbooks/aws-parallelcluster-environment/metadata.rb b/cookbooks/aws-parallelcluster-environment/metadata.rb
@@ -15,6 +15,6 @@
 supports 'redhat', '= 8.7'
 
 depends 'line', '~> 4.5.13'
-depends 'nfs', '~> 5.0.0'
+depends 'nfs', '~> 5.1.2'
 
 depends 'aws-parallelcluster-shared', '~> 3.9.0'
diff --git a/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb
@@ -49,10 +49,7 @@ def for_all_oses
 end
 
 def runner(platform:, version:, step_into: [])
-  path = '../aws-parallelcluster-shared/spec/ubuntu.22.json' if "#{platform}#{version}" == 'ubuntu22.04'
-  ChefSpec::SoloRunner.new(
-    platform: platform, version: version, step_into: step_into, path: path
-  ) do |node|
+  ChefSpec::SoloRunner.new(platform: platform, version: version, step_into: step_into) do |node|
     yield node if block_given?
   end
 end