From fbc9d4bcad2fc0e0f0fee444fe25b75861f60f0f Mon Sep 17 00:00:00 2001
From: Helena Greebe <hgreebe@amazon.com>
Date: Thu, 13 Jun 2024 20:47:55 -0400
Subject: [PATCH] Point s3 url for dependency download to production bucket

---
 .../recipes/install/cfn_bootstrap.rb                          | 2 +-
 .../spec/unit/recipes/cfn_bootstrap_spec.rb                   | 2 +-
 .../aws-parallelcluster-shared/attributes/environment.rb      | 4 ++--
 cookbooks/aws-parallelcluster-shared/attributes/versions.rb   | 2 +-
 .../aws-parallelcluster-slurm/attributes/slurm_attributes.rb  | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cookbooks/aws-parallelcluster-environment/recipes/install/cfn_bootstrap.rb b/cookbooks/aws-parallelcluster-environment/recipes/install/cfn_bootstrap.rb
index dbaadab11..616b4c93a 100644
--- a/cookbooks/aws-parallelcluster-environment/recipes/install/cfn_bootstrap.rb
+++ b/cookbooks/aws-parallelcluster-environment/recipes/install/cfn_bootstrap.rb
@@ -15,7 +15,7 @@
 virtualenv_name = 'cfn_bootstrap_virtualenv'
 pyenv_root = node['cluster']['system_pyenv_root']
 # FIXME: Python Version cfn_bootstrap_virtualenv due to a bug with cfn-hup
-python_version = '3.9.17'
+python_version = '3.9.19'
 virtualenv_path = "#{pyenv_root}/versions/#{python_version}/envs/#{virtualenv_name}"
 
 node.default['cluster']['cfn_bootstrap_virtualenv_path'] = virtualenv_path
diff --git a/cookbooks/aws-parallelcluster-environment/spec/unit/recipes/cfn_bootstrap_spec.rb b/cookbooks/aws-parallelcluster-environment/spec/unit/recipes/cfn_bootstrap_spec.rb
index eda316c16..97f6d302f 100644
--- a/cookbooks/aws-parallelcluster-environment/spec/unit/recipes/cfn_bootstrap_spec.rb
+++ b/cookbooks/aws-parallelcluster-environment/spec/unit/recipes/cfn_bootstrap_spec.rb
@@ -5,7 +5,7 @@
     context "on #{platform}#{version}" do
       cached(:cfnbootstrap_version) { '2.0-28' }
       cached(:cfnbootstrap_package) { "aws-cfn-bootstrap-py3-#{cfnbootstrap_version}.tar.gz" }
-      cached(:python_version) { '3.9.17' }
+      cached(:python_version) { '3.9.19' }
       cached(:system_pyenv_root) { 'system_pyenv_root' }
       cached(:virtualenv_path) { "system_pyenv_root/versions/#{python_version}/envs/cfn_bootstrap_virtualenv" }
 
diff --git a/cookbooks/aws-parallelcluster-shared/attributes/environment.rb b/cookbooks/aws-parallelcluster-shared/attributes/environment.rb
index 8bf13c5fe..0cb340960 100644
--- a/cookbooks/aws-parallelcluster-shared/attributes/environment.rb
+++ b/cookbooks/aws-parallelcluster-shared/attributes/environment.rb
@@ -5,6 +5,6 @@
 
 # URL for ParallelCluster Artifacts stored in public S3 buckets
 # ['cluster']['region'] will need to be defined by image_dna.json during AMI build.
-default['cluster']['base_build_url'] = "s3://aws-parallelcluster-dev-build-dependencies"
-default['cluster']['artifacts_s3_url'] = "https://aws-parallelcluster-dev-commercial.s3.#{node['cluster']['aws_domain']}/archives"
+default['cluster']['base_build_url'] = "s3://#{node['cluster']['region']}-aws-parallelcluster"
 default['cluster']['artifacts_build_url'] = "#{node['cluster']['base_build_url']}/archives/dependencies"
+default['cluster']['artifacts_s3_url'] = "https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}/archives"
\ No newline at end of file
diff --git a/cookbooks/aws-parallelcluster-shared/attributes/versions.rb b/cookbooks/aws-parallelcluster-shared/attributes/versions.rb
index 87ca20c00..08c7f1a9b 100644
--- a/cookbooks/aws-parallelcluster-shared/attributes/versions.rb
+++ b/cookbooks/aws-parallelcluster-shared/attributes/versions.rb
@@ -1,5 +1,5 @@
 # Python Version
-default['cluster']['python-version'] = '3.9.17'
+default['cluster']['python-version'] = '3.9.19'
 default['cluster']['python-major-minor-version'] = '3.9'
 
 # ParallelCluster versions
diff --git a/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb b/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
index b9e97d9f1..9c5e80350 100644
--- a/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
+++ b/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
@@ -13,8 +13,8 @@
 default['cluster']['enable_nss_slurm'] = node['cluster']['directory_service']['enabled']
 
 # PMIX Version and Checksum
-default['cluster']['pmix']['version'] = '4.2.9'
-default['cluster']['pmix']['sha256'] = '00ddb36fb81c31519972079a218c3cdd903510fc3910abaf4d484068fa29e884'
+default['cluster']['pmix']['version'] = '5.0.2'
+default['cluster']['pmix']['sha256'] = '133e79c44d426043fa54b80649ecc97607b915ad8c5cc119575a3dd0c4104941'
 
 # Slurmdbd
 default['cluster']['slurmdbd_service_enabled'] = "true"