Skip to content

Commit 96fab6e

Browse files
hgreebehgreebe
committed
Fix how berksfiles source the local repo
1 parent fcfe123 commit 96fab6e

File tree

12 files changed

+137
-9
lines changed

12 files changed

+137
-9
lines changed

‎Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To add a new cookbook dependency or to change version for an existing dependency
44
# uncomment the following line to enable the public Chef supermarket endpoint
55
# source 'https://supermarket.chef.io'
6-
source chef_repo: "."
6+
source "chef_repo:."
77

88
metadata
99

‎cookbook.diff‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
diff --git a/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_alinux2023.rb b/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_alinux2023.rb
2+
index 1d5a679b..fdb822ad 100644
3+
--- a/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_alinux2023.rb
4+
+++ b/cookbooks/aws-parallelcluster-slurm/resources/slurm_dependencies/slurm_dependencies_alinux2023.rb
5+
@@ -14,6 +14,13 @@ end
6+
7+
use 'partial/_slurm_dependencies_common'
8+
9+
+http_parser_version = "2.9.4"
10+
+http_parser_url = "#{node['cluster']['artifacts_s3_url']}/dependencies/http_parser/v#{http_parser_version}.tar.gz"
11+
+http_parser_tarball = "#{node['cluster']['sources_dir']}/http-parser-#{http_parser_version}.tar.gz"
12+
+
13+
+def fabric_manager_url
14+
+ "#{node['cluster']['artifacts_s3_url']}/dependencies/nvidia_fabric/#{platform}/#{fabric_manager_package}-#{fabric_manager_version}-1.#{arch_suffix}.rpm"
15+
+end
16+
def dependencies
17+
%w(json-c-devel perl perl-Switch lua-devel dbus-devel)
18+
end
19+
@@ -22,13 +29,35 @@ action :install_extra_dependencies do
20+
# http parser is no longer maintained, therefore Amazon Linux 2023 does have have the package in OS repos
21+
# https://docs.aws.amazon.com/linux/al2023/release-notes/removed-AL2023.4-AL2.html
22+
# Following https://slurm.schedmd.com/related_software.html#jwt for Installing Http-parser
23+
- bash 'Install http-parser' do
24+
- code <<-HTTP_PARSER
25+
- set -e
26+
- git clone --depth 1 --single-branch -b v2.9.4 https://github.com/nodejs/http-parser.git http_parser
27+
- cd http_parser
28+
- make
29+
- make install
30+
- HTTP_PARSER
31+
+
32+
+ remote_file "#{http_parser_tarball}" do
33+
+ source "#{http_parser_url}"
34+
+ mode '0644'
35+
+ retries 3
36+
+ retry_delay 5
37+
+ action :create_if_missing
38+
end
39+
+
40+
+ bash 'make install' do
41+
+ user 'root'
42+
+ group 'root'
43+
+ cwd "#{node['cluster']['sources_dir']}"
44+
+ code <<-HTTP
45+
+ set -e
46+
+ tar xf #{http_parser_tarball}
47+
+ cd http-parser-#{http_parser_version}
48+
+ make
49+
+ make install
50+
+ HTTP
51+
+ end
52+
+
53+
+ # bash 'Install http-parser' do
54+
+ # code <<-HTTP_PARSER
55+
+ # set -e
56+
+ # git clone --depth 1 --single-branch -b v2.9.4 https://github.com/nodejs/http-parser.git http_parser
57+
+ # cd http_parser
58+
+ # make
59+
+ # make install
60+
+ # HTTP_PARSER
61+
+ # end
62+
end

‎cookbook.txt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
diff --git a/cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_amazon2.rb b/cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_amazon2.rb
2+
index ca395dd7..1db23581 100644
3+
--- a/cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_amazon2.rb
4+
+++ b/cookbooks/aws-parallelcluster-platform/resources/install_packages/install_packages_amazon2.rb
5+
@@ -47,24 +47,26 @@ action :install_extras do
6+
alinux_extras_topic topic
7+
end
8+
9+
- if aws_region.start_with?("us-iso")
10+
- remote_file "epel_deps.tar.gz" do
11+
- source "#{node['cluster']['artifacts_s3_url']}/dependencies/epel/rhel7/#{node['kernel']['machine']}/deps-v2.tar.gz"
12+
- mode '0644'
13+
- retries 3
14+
- retry_delay 5
15+
- action :create_if_missing
16+
- end
17+
+ # if aws_region.start_with?("us-iso")
18+
+
19+
+ # remote_file "epel_deps.tar.gz" do
20+
+ # source "#{node['cluster']['artifacts_s3_url']}/dependencies/epel/rhel7/#{node['kernel']['machine']}/deps-v2.tar.gz"
21+
+ # mode '0644'
22+
+ # retries 3
23+
+ # retry_delay 5
24+
+ # action :create_if_missing
25+
+ # end
26+
27+
- bash 'yum install missing deps' do
28+
- user 'root'
29+
- group 'root'
30+
- code <<-REQ
31+
- set -e
32+
- tar xzf epel_deps.tar.gz
33+
- cd epel
34+
- yum install -y * 2>/dev/null
35+
- REQ
36+
- end
37+
+ bash 'yum install missing deps' do
38+
+ user 'root'
39+
+ group 'root'
40+
+ code <<-REQ
41+
+ set -e
42+
+ aws s3 cp s3://aws-parallelcluster-dev-build-dependencies/archives/dependencies/epel/rhel7/x86_64/deps-v2.tar.gz epel_deps.tar.gz
43+
+ tar xzf epel_deps.tar.gz
44+
+ cd epel
45+
+ yum install -y * 2>/dev/null
46+
+ REQ
47+
end
48+
+
49+
end

‎cookbooks/aws-parallelcluster-awsbatch/Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
source chef_repo: "."
2+
source "chef_repo:."
33
metadata
44

55
cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"

‎cookbooks/aws-parallelcluster-computefleet/Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
source chef_repo: "."
2+
source "chef_repo:."
33
metadata
44

55
cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"

‎cookbooks/aws-parallelcluster-entrypoints/Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
source chef_repo: "."
2+
source "chef_repo:."
33
metadata
44

55
cookbook "aws-parallelcluster-awsbatch", path: "../aws-parallelcluster-awsbatch"

‎cookbooks/aws-parallelcluster-environment/Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
source chef_repo: "."
2+
source "chef_repo:."
33
metadata
44

55
cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"

‎cookbooks/aws-parallelcluster-platform/Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
source chef_repo: "."
2+
source "chef_repo:."
33
metadata
44

55
cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"

‎cookbooks/aws-parallelcluster-shared/Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
source chef_repo: "."
3+
source "chef_repo:."
44

55
metadata
66

‎cookbooks/aws-parallelcluster-slurm/Berksfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
source chef_repo: "."
2+
source "chef_repo:."
33
metadata
44

55
cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-computefleet"

0 commit comments

Comments
 (0)