Developjun26

.gitignore

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

Gemfile

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

README.md

@@ -8,9 +8,8 @@ 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, since it contains two files: `Policyfile.rb` and `metadata.rb`.
+These files are used by the CLI (build image time) and `user-data.sh` code to vendor the other sub-cookbooks and third party cookbooks.
 
 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:
@@ -391,13 +390,14 @@ 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
+### Known issues with Policyfiles
 
 #### Kitchen doesn't see your changes
 
 If Kitchen doesn't detect your changes, try
 ```
-berks shelf uninstall ${COOKBOOK_NAME}
+chef install
+chef push kitchen
 ```
 
 ## About python tests

cookbooks/aws-parallelcluster-computefleet/spec/spec_helper.rb

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

cookbooks/aws-parallelcluster-entrypoints/spec/spec_helper.rb

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

cookbooks/aws-parallelcluster-environment/spec/spec_helper.rb

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

cookbooks/aws-parallelcluster-platform/spec/spec_helper.rb

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

cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb

@@ -1,10 +1,22 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 # Chef::Mixin::ShellOut is required to mock shellout
 include Chef::Mixin::ShellOut
 
 RSpec.configure do |c|
+  c.before(:suite) do
+    # Copy third-party cookbooks to cookbooks directory for ChefSpec tests
+    require 'fileutils'
+    third_party_path = File.expand_path('../../third-party', __dir__)
+    cookbooks_path = File.expand_path('../..', __dir__)
+    if Dir.exist?(third_party_path)
+      Dir.glob(File.join(third_party_path, '*')).each do |cookbook|
+        next unless File.directory?(cookbook)
+        FileUtils.cp_r(cookbook, cookbooks_path)
+      end
+    end
+  end
+
   c.before(:each) do
     allow(File).to receive(:exist?).and_call_original
     allow(Dir).to receive(:exist?).and_call_original

cookbooks/aws-parallelcluster-slurm/spec/spec_helper.rb

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