[develop] Upgrade all third party cookbooks except nfs

Berksfile

@@ -7,15 +7,15 @@ source chef_repo: "."
 
 metadata
 
-cookbook "apt", path: "./cookbooks/third-party/apt-7.4.2"
+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.2"
+cookbook "line", path: "./cookbooks/third-party/line-4.5.13"
 cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0"
-cookbook "openssh", path: "./cookbooks/third-party/openssh-2.10.3"
-cookbook "pyenv", path: "./cookbooks/third-party/pyenv-3.5.1"
-cookbook "selinux", path: "./cookbooks/third-party/selinux-6.0.5"
-cookbook "yum", path: "./cookbooks/third-party/yum-7.4.0"
-cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-4.5.0"
+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"
+cookbook "yum", path: "./cookbooks/third-party/yum-7.4.13"
+cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-5.0.2"
 
 cookbook "aws-parallelcluster-awsbatch", path: "./cookbooks/aws-parallelcluster-awsbatch"
 cookbook "aws-parallelcluster-computefleet", path: "./cookbooks/aws-parallelcluster-computefleet"

CHANGELOG.md

@@ -9,6 +9,14 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 **ENHANCEMENTS**
 
 **CHANGES**
+- Upgrade third-party cookbook dependencies:
+  - apt-7.5.14 (from apt-7.4.0)
+  - line-4.5.13 (from line-4.5.2)
+  - openssh-2.11.3 (from openssh-2.10.3)
+  - pyenv-4.2.3 (from pyenv-3.5.1)
+  - selinux-6.1.12 (from selinux-6.0.5)
+  - yum-7.4.13 (from yum-7.4.0)
+  - yum-epel-5.0.2 (from yum-epel-4.5.0)
 
 **BUG FIXES**
 
@@ -258,7 +266,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Move `SelectTypeParameters` and `ConstrainRAMSpace` to the `parallelcluster_slurm*.conf` include files.
 - Upgrade third-party cookbook dependencies:
   - apt-7.4.2 (from apt-7.4.0)
-  - line-4.5.2 (from line-4.0.1)
+  - line-4.5.13 (from line-4.0.1)
   - openssh-2.10.3 (from openssh-2.9.1)
   - pyenv-3.5.1 (from pyenv-3.4.2)
   - selinux-6.0.4 (from selinux-3.1.1)

cookbooks/aws-parallelcluster-awsbatch/Berksfile

@@ -12,12 +12,12 @@ cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-compu
 cookbook "aws-parallelcluster-tests", path: "../aws-parallelcluster-tests"
 cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
 
-cookbook "apt", path: "../third-party/apt-7.4.2"
+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.2"
+cookbook "line", path: "../third-party/line-4.5.13"
 cookbook "nfs", path: "../third-party/nfs-5.0.0"
-cookbook "openssh", path: "../third-party/openssh-2.10.3"
-cookbook "pyenv", path: "../third-party/pyenv-3.5.1"
-cookbook "selinux", path: "../third-party/selinux-6.0.5"
-cookbook "yum", path: "../third-party/yum-7.4.0"
-cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0"
+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"
+cookbook "yum", path: "../third-party/yum-7.4.13"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"

cookbooks/aws-parallelcluster-awsbatch/metadata.rb

@@ -13,13 +13,13 @@
 supports 'centos', '>= 7.0'
 supports 'ubuntu', '>= 20.04'
 
-depends 'apt', '~> 7.4.2'
+depends 'apt', '~> 7.5.14'
 depends 'iptables', '~> 8.0.0'
 depends 'nfs', '~> 5.0.0'
-depends 'line', '~> 4.5.2'
-depends 'openssh', '~> 2.10.3'
-depends 'pyenv', '~> 3.5.1'
-depends 'selinux', '~> 6.0.5'
-depends 'yum', '~> 7.4.0'
-depends 'yum-epel', '~> 4.5.0'
+depends 'line', '~> 4.5.13'
+depends 'openssh', '~> 2.11.3'
+depends 'pyenv', '~> 4.2.3'
+depends 'selinux', '~> 6.1.12'
+depends 'yum', '~> 7.4.13'
+depends 'yum-epel', '~> 5.0.2'
 depends 'aws-parallelcluster-shared', '~> 3.8.0'

cookbooks/aws-parallelcluster-computefleet/Berksfile

@@ -5,6 +5,6 @@ metadata
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
 # for shared cookbook
-cookbook "pyenv", path: "../third-party/pyenv-3.5.1"
-cookbook "yum", path: "../third-party/yum-7.4.0"
-cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0"
+cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
+cookbook "yum", path: "../third-party/yum-7.4.13"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"

cookbooks/aws-parallelcluster-entrypoints/Berksfile

@@ -9,15 +9,15 @@ cookbook "aws-parallelcluster-platform", path: "../aws-parallelcluster-platform"
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
 
-cookbook "apt", path: "../third-party/apt-7.4.2"
+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.2"
+cookbook "line", path: "../third-party/line-4.5.13"
 cookbook "nfs", path: "../third-party/nfs-5.0.0"
-cookbook "openssh", path: "../third-party/openssh-2.10.3"
-cookbook "pyenv", path: "../third-party/pyenv-3.5.1"
-cookbook "selinux", path: "../third-party/selinux-6.0.5"
-cookbook "yum", path: "../third-party/yum-7.4.0"
-cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0"
+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"
+cookbook "yum", path: "../third-party/yum-7.4.13"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
 
 group :integration do
   cookbook 'aws-parallelcluster-tests', path: '../aws-parallelcluster-tests'

cookbooks/aws-parallelcluster-environment/Berksfile

@@ -7,9 +7,9 @@ cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 cookbook "nfs", path: "../third-party/nfs-5.0.0"
 
 # dependency od nfs
-cookbook "line", path: "../third-party/line-4.5.2"
+cookbook "line", path: "../third-party/line-4.5.13"
 
 # for shared cookbook
-cookbook "pyenv", path: "../third-party/pyenv-3.5.1"
-cookbook "yum", path: "../third-party/yum-7.4.0"
-cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0"
+cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
+cookbook "yum", path: "../third-party/yum-7.4.13"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"

cookbooks/aws-parallelcluster-environment/metadata.rb

@@ -14,7 +14,7 @@
 supports 'ubuntu', '>= 20.04'
 supports 'redhat', '= 8.7'
 
-depends 'line', '~> 4.5.2'
+depends 'line', '~> 4.5.13'
 depends 'nfs', '~> 5.0.0'
 
 depends 'aws-parallelcluster-shared', '~> 3.8.0'

cookbooks/aws-parallelcluster-platform/Berksfile

@@ -4,10 +4,10 @@ metadata
 
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
-cookbook "line", path: "../third-party/line-4.5.2"
-cookbook "selinux", path: "../third-party/selinux-6.0.5"
+cookbook "line", path: "../third-party/line-4.5.13"
+cookbook "selinux", path: "../third-party/selinux-6.1.12"
 
 # for shared cookbook
-cookbook "pyenv", path: "../third-party/pyenv-3.5.1"
-cookbook "yum", path: "../third-party/yum-7.4.0"
-cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0"
+cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
+cookbook "yum", path: "../third-party/yum-7.4.13"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"

cookbooks/aws-parallelcluster-platform/metadata.rb

@@ -14,7 +14,7 @@
 supports 'ubuntu', '>= 20.04'
 supports 'redhat', '= 8.7'
 
-depends 'line', '~> 4.5.2'
-depends 'selinux', '~> 6.0.5'
+depends 'line', '~> 4.5.13'
+depends 'selinux', '~> 6.1.12'
 
 depends 'aws-parallelcluster-shared', '~> 3.8.0'

cookbooks/aws-parallelcluster-shared/Berksfile

@@ -4,6 +4,6 @@ source chef_repo: "."
 
 metadata
 
-cookbook "pyenv", path: "../third-party/pyenv-3.5.1"
-cookbook "yum", path: "../third-party/yum-7.4.0"
-cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0"
+cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
+cookbook "yum", path: "../third-party/yum-7.4.13"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"

cookbooks/aws-parallelcluster-shared/metadata.rb

@@ -14,6 +14,6 @@
 supports 'ubuntu', '>= 20.04'
 supports 'redhat', '= 8.7'
 
-depends 'pyenv', '~> 3.5.1'
-depends 'yum', '~> 7.4.0'
-depends 'yum-epel', '~> 4.5.0'
+depends 'pyenv', '~> 4.2.3'
+depends 'yum', '~> 7.4.13'
+depends 'yum-epel', '~> 5.0.2'

cookbooks/aws-parallelcluster-shared/resources/install_pyenv.rb

@@ -18,9 +18,9 @@
   if new_resource.user_only
     raise "user property is required for resource install_pyenv when user_only is set to true" unless new_resource.user
 
-    pyenv_user_install python_version do
+    pyenv_install 'user' do
       user new_resource.user
-      user_prefix new_resource.prefix if new_resource.prefix
+      prefix new_resource.prefix if new_resource.prefix
     end
   else
     prefix = new_resource.prefix || node['cluster']['system_pyenv_root']
@@ -29,8 +29,8 @@
       recursive true
     end
 
-    pyenv_system_install python_version do
-      global_prefix prefix
+    pyenv_install 'system' do
+      prefix prefix
     end
 
     # Remove the profile.d script that the pyenv cookbook writes.

cookbooks/aws-parallelcluster-shared/spec/unit/resources/install_pyenv_spec.rb

@@ -38,8 +38,7 @@ def self.run(chef_run, python_version: nil, pyenv_root: nil, user_only: nil, use
         end
 
         it 'installs pyenv system' do
-          is_expected.to install_pyenv_system_install(python_version)
-            .with_global_prefix(system_pyenv_root)
+          is_expected.to install_pyenv_install('system').with_prefix(system_pyenv_root)
         end
 
         it 'deletes /etc/profile.d/pyenv.sh to avoid exposing the ParallelCluster pyenv installation to customers' do ||
@@ -68,8 +67,7 @@ def self.run(chef_run, python_version: nil, pyenv_root: nil, user_only: nil, use
         end
 
         it 'installs pyenv system' do
-          is_expected.to install_pyenv_system_install(python_version)
-            .with_global_prefix(system_pyenv_root)
+          is_expected.to install_pyenv_install('system').with_prefix(system_pyenv_root)
         end
 
         it 'installs default python version' do
@@ -98,9 +96,9 @@ def self.run(chef_run, python_version: nil, pyenv_root: nil, user_only: nil, use
           end
 
           it 'installs pyenv for user' do
-            is_expected.to install_pyenv_user_install(python_version).with(
+            is_expected.to install_pyenv_install('user').with(
               user: user,
-              user_prefix: pyenv_root
+              prefix: pyenv_root
             )
           end
 

cookbooks/aws-parallelcluster-slurm/Berksfile

@@ -6,12 +6,12 @@ cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-compu
 cookbook "aws-parallelcluster-environment", path: "../aws-parallelcluster-environment"
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
-cookbook "apt", path: "../third-party/apt-7.4.2"
+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.2"
+cookbook "line", path: "../third-party/line-4.5.13"
 cookbook "nfs", path: "../third-party/nfs-5.0.0"
-cookbook "openssh", path: "../third-party/openssh-2.10.3"
-cookbook "pyenv", path: "../third-party/pyenv-3.5.1"
-cookbook "selinux", path: "../third-party/selinux-6.0.5"
-cookbook "yum", path: "../third-party/yum-7.4.0"
-cookbook "yum-epel", path: "../third-party/yum-epel-4.5.0"
+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"
+cookbook "yum", path: "../third-party/yum-7.4.13"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"

cookbooks/aws-parallelcluster-slurm/metadata.rb

@@ -13,15 +13,15 @@
 supports 'centos', '>= 7.0'
 supports 'ubuntu', '>= 20.04'
 
-depends 'apt', '~> 7.4.2'
+depends 'apt', '~> 7.5.14'
 depends 'iptables', '~> 8.0.0'
-depends 'line', '~> 4.5.2'
+depends 'line', '~> 4.5.13'
 depends 'nfs', '~> 5.0.0'
-depends 'openssh', '~> 2.10.3'
-depends 'pyenv', '~> 3.5.1'
-depends 'selinux', '~> 6.0.5'
-depends 'yum', '~> 7.4.0'
-depends 'yum-epel', '~> 4.5.0'
+depends 'openssh', '~> 2.11.3'
+depends 'pyenv', '~> 4.2.3'
+depends 'selinux', '~> 6.1.12'
+depends 'yum', '~> 7.4.13'
+depends 'yum-epel', '~> 5.0.2'
 depends 'aws-parallelcluster-computefleet', '~> 3.8.0'
 depends 'aws-parallelcluster-environment', '~> 3.8.0'
 depends 'aws-parallelcluster-shared', '~> 3.8.0'

cookbooks/third-party/THIRD-PARTY-LICENSES.txt

@@ -1,12 +1,12 @@
-** apt Cookbook; version 7.4.2 -- https://github.com/sous-chefs/apt
-** iptables cookbook; version 8.0.0 -- https://github.com/sous-chefs/iptables
-** line cookbook; version 4.5.2 -- https://github.com/sous-chefs/line
-** NFS cookbook; version 5.0.0 -- https://github.com/atomic-penguin/cookbook-nfs
-** openssh cookbook; version 2.10.3 -- https://github.com/sous-chefs/openssh
-** pyenv cookbook; version 3.5.1 -- https://github.com/sous-chefs/pyenv
-** SELinux cookbook; version 6.0.4 -- https://github.com/sous-chefs/selinux
-** yum cookbook; version 7.4.0 -- https://github.com/sous-chefs/yum
-** yum-epel cookbook; version 4.5.0 -- https://github.com/sous-chefs/yum-epel
+** apt Cookbook -- https://github.com/sous-chefs/apt
+** iptables cookbook -- https://github.com/sous-chefs/iptables
+** line cookbook -- https://github.com/sous-chefs/line
+** NFS cookbook -- https://github.com/atomic-penguin/cookbook-nfs
+** openssh cookbook -- https://github.com/sous-chefs/openssh
+** pyenv cookbook -- https://github.com/sous-chefs/pyenv
+** SELinux cookbook -- https://github.com/sous-chefs/selinux
+** yum cookbook -- https://github.com/sous-chefs/yum
+** yum-epel cookbook -- https://github.com/sous-chefs/yum-epel
 
 Apache License