aws · hanwen-cluster · Jul 9, 2025 · Jul 7, 2025 · Jul 7, 2025 · Jul 9, 2025
@@ -95,7 +95,7 @@ jobs:
         uses: ludeeus/action-shellcheck@master
         with:
           severity: warning
-          ignore_paths: cookbooks/third-party
+          ignore_paths: cookbooks/iptables cookbooks/line cookbooks/nfs cookbooks/openssh cookbooks/yum cookbooks/yum-epel
   rspec:
     name: ChefSpec
     runs-on: ubuntu-latest

@@ -2,7 +2,6 @@
 .idea
 *.iml
 .vagrant
-Berksfile.lock
 *~
 *#
 .#*

@@ -98,7 +98,12 @@ Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
 AllCops:
   NewCops: enable
   Exclude:
-    - 'cookbooks/third-party/**/*'
+    - 'cookbooks/iptables/**/*'
+    - 'cookbooks/line/**/*'
+    - 'cookbooks/nfs/**/*'
+    - 'cookbooks/openssh/**/*'
+    - 'cookbooks/yum/**/*'
+    - 'cookbooks/yum-epel/**/*'
 
 Chef/Deprecations/ChefSpecCoverageReport:
   Enabled: false
@@ -13,6 +13,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Ubuntu 20.04 is no longer supported.
 - Upgrade Slurm to version 24.11.5.
 - Upgrade DCV to version 2024.0-19030.
+- Remove `berkshelf`. All cookbooks are local and do not need `berkshelf` dependency management.
 
 3.13.2
 ------

@@ -2,8 +2,6 @@
 
 source 'https://rubygems.org'
 
-gem 'berkshelf'
-
 group :style do
   gem 'cookstyle', '~> 7.25.9'
   gem 'rake', '~> 13.0.1'

@@ -8,9 +8,7 @@ This repo contains the AWS ParallelCluster Chef cookbook used in AWS ParallelClu
 
 # Code structure
 
-The root folder of the cookbook repository can be considered the main cookbook, since it contains two files: `Berksfile` and `metadata.rb`.
-These files are used by the CLI (build image time) and `user-data.sh` code to [vendor](https://docs.chef.io/workstation/berkshelf/#berks-vendor)
-the other sub-cookbooks and third party cookbooks.
+The root folder of the cookbook repository can be considered the main cookbook.
 
 The main cookbook does not contain any recipe, attribute or library. They are distributed in the functional cookbooks under the `cookbooks` folder
 defined as follows:
@@ -34,9 +32,9 @@ The `test` folder contains Python unit tests files and Kitchen [environment](htt
 
 The `kitchen` folder contains utility files used when running Inspec tests locally.
 
-The `cookbooks/third-party` folder contains cookbooks from marketplace. They must be regularly updated and should not be modified by hand.
+The `iptables`, `line`, `nfs`, `openssh`, `yum`, `yum-eple` are cookbooks from marketplace. They must be regularly updated and should not be modified by hand.
 They have been pre-downloaded and stored in our repository to avoid contacting Chef Marketplace at AMI build time and cluster creation.
-You can find more information about them in the `cookbooks/third-party/THIRD-PARTY-LICENSES.txt` file.
+You can find more information about them in the `cookbooks/THIRD-PARTY-LICENSES.txt` file.
 
 # Development
 
@@ -391,15 +389,6 @@ If you interrupt it and try to run `kitchen verify`, you see authentication fail
 This happens because Ubuntu22 does not accept authentication via RSA key. You need to re-create a key pair 
 using `ED25519` key type.
 
-### Known issues with Berks
-
-#### Kitchen doesn't see your changes
-
-If Kitchen doesn't detect your changes, try
-```
-berks shelf uninstall ${COOKBOOK_NAME}
-```
-
 ## About python tests
 
 Python tests are configured in `tox.ini` file, including paths to python files.

@@ -1,4 +1,3 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
@@ -1,4 +1,3 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
 

@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
 

@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 # Chef::Mixin::ShellOut is required to mock shellout
 include Chef::Mixin::ShellOut

@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     .idea
     *.iml
     .vagrant
-    Berksfile.lock
     *~
     *#
     .#*
@@ Expand Down @@