Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-3.7] Upgrade all third party cookbooks except nfs #2417

Merged
merged 9 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@ aws-parallelcluster-cookbook CHANGELOG

This file is used to list changes made in each version of the AWS ParallelCluster cookbook.

3.8.0
------

**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)

**BUG FIXES**

3.7.0
------

Expand Down Expand Up @@ -30,6 +46,14 @@ This file is used to list changes made in each version of the AWS ParallelCluste
- Open MPI: `openmpi40-aws-4.1.5-3`
- Upgrade Slurm to version 23.02.4.
- Upgrade ARM PL to version 23.04.1 for Ubuntu 22.04 only.
- 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**
- Fix cluster creation failure with Ubuntu Deep Learning AMI on GPU instances and DCV enabled.
Expand Down Expand Up @@ -249,7 +273,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)
Expand Down
14 changes: 7 additions & 7 deletions cookbooks/aws-parallelcluster-awsbatch/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 7 additions & 7 deletions cookbooks/aws-parallelcluster-awsbatch/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0'
6 changes: 3 additions & 3 deletions cookbooks/aws-parallelcluster-computefleet/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 7 additions & 7 deletions cookbooks/aws-parallelcluster-entrypoints/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions cookbooks/aws-parallelcluster-environment/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-environment/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0'
10 changes: 5 additions & 5 deletions cookbooks/aws-parallelcluster-platform/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions cookbooks/aws-parallelcluster-platform/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0'
6 changes: 3 additions & 3 deletions cookbooks/aws-parallelcluster-shared/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions cookbooks/aws-parallelcluster-shared/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions cookbooks/aws-parallelcluster-slurm/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 7 additions & 7 deletions cookbooks/aws-parallelcluster-slurm/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0'
depends 'aws-parallelcluster-environment', '~> 3.7.0'
depends 'aws-parallelcluster-shared', '~> 3.7.0'
18 changes: 9 additions & 9 deletions cookbooks/third-party/THIRD-PARTY-LICENSES.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 0 additions & 10 deletions cookbooks/third-party/apt-7.4.2/.circleci/config.yml

This file was deleted.

19 changes: 0 additions & 19 deletions cookbooks/third-party/apt-7.4.2/.editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion cookbooks/third-party/apt-7.4.2/.envrc

This file was deleted.

1 change: 0 additions & 1 deletion cookbooks/third-party/apt-7.4.2/.gitattributes

This file was deleted.

1 change: 0 additions & 1 deletion cookbooks/third-party/apt-7.4.2/.github/CODEOWNERS

This file was deleted.

Loading