From d190cf5e304da6dccf5c81c603d01d7ef45b2ae4 Mon Sep 17 00:00:00 2001
From: Helena Greebe <hgreebe@amazon.com>
Date: Thu, 9 Jan 2025 22:04:00 -0500
Subject: [PATCH 1/2] Bump gdr copy version up from 2.4 to 2.4.4

---
 .../resources/gdrcopy/partial/_gdrcopy_common.rb              | 4 ++--
 .../spec/unit/resources/gdrcopy_spec.rb                       | 4 ++--
 .../test/controls/nvidia_gdrcopy_spec.rb                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/partial/_gdrcopy_common.rb b/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/partial/_gdrcopy_common.rb
index bef0644160..e7cce185a6 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/partial/_gdrcopy_common.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/gdrcopy/partial/_gdrcopy_common.rb
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 def gdrcopy_version
-  '2.4'
+  '2.4.4'
 end
 
 def gdrcopy_checksum
-  '39e74d505ca16160567f109cc23478580d157da897f134989df1d563e55f7a5b'
+  '8802f7bc4a589a610118023bdcdd83c10a56dea399acf6eeaac32e8cc10739a8'
 end
 
 unified_mode true
diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb
index 4dd9b83d8a..8b672be893 100644
--- a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb
@@ -136,7 +136,7 @@ def self.configure(chef_run)
         expected_gdrcopy_version = if platform == "centos"
                                      "2.3.1"
                                    else
-                                     "2.4"
+                                     "2.4.4"
                                    end
         expect(resource.gdrcopy_version).to eq(expected_gdrcopy_version)
       end
@@ -186,7 +186,7 @@ def self.configure(chef_run)
 
     context "on #{platform}#{version} when gdrcopy enabled" do
       cached(:sources_dir) { 'sources_dir' }
-      cached(:gdrcopy_version) { platform == 'centos' ? '2.3.1' : '2.4' }
+      cached(:gdrcopy_version) { platform == 'centos' ? '2.3.1' : '2.4.4' }
       cached(:gdrcopy_checksum) do
         if platform == 'centos'
           '59b3cc97a4fc6008a5407506d9e67ecc4144cfad61c261217fabcb671cd30ca8'
diff --git a/cookbooks/aws-parallelcluster-platform/test/controls/nvidia_gdrcopy_spec.rb b/cookbooks/aws-parallelcluster-platform/test/controls/nvidia_gdrcopy_spec.rb
index 49aa9ac984..276891b82b 100644
--- a/cookbooks/aws-parallelcluster-platform/test/controls/nvidia_gdrcopy_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/test/controls/nvidia_gdrcopy_spec.rb
@@ -15,7 +15,7 @@
       (node['cluster']['nvidia']['enabled'] == 'yes' || node['cluster']['nvidia']['enabled'] == true)
   end
 
-  expected_gdrcopy_version = node['cluster']['nvidia']['gdrcopy']['version']
+  expected_gdrcopy_version = "2.4"
 
   describe "gdrcopy version is expected to be #{expected_gdrcopy_version}" do
     subject { command('modinfo -F version gdrdrv').stdout.strip() }

From 3749791b22f0853133038559c7945073d5295ffc Mon Sep 17 00:00:00 2001
From: Helena Greebe <hgreebe@amazon.com>
Date: Mon, 13 Jan 2025 08:41:43 -0500
Subject: [PATCH 2/2] Fix chefspec test for new gdrcopy version

---
 .../spec/unit/resources/gdrcopy_spec.rb                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb
index 8b672be893..3f1027cd54 100644
--- a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/gdrcopy_spec.rb
@@ -160,7 +160,7 @@ def self.configure(chef_run)
         expected_gdrcopy_checksum = if platform == "centos"
                                       "59b3cc97a4fc6008a5407506d9e67ecc4144cfad61c261217fabcb671cd30ca8"
                                     else
-                                      "39e74d505ca16160567f109cc23478580d157da897f134989df1d563e55f7a5b"
+                                      "8802f7bc4a589a610118023bdcdd83c10a56dea399acf6eeaac32e8cc10739a8"
                                     end
         expect(resource.gdrcopy_checksum).to eq(expected_gdrcopy_checksum)
       end
@@ -191,7 +191,7 @@ def self.configure(chef_run)
         if platform == 'centos'
           '59b3cc97a4fc6008a5407506d9e67ecc4144cfad61c261217fabcb671cd30ca8'
         else
-          '39e74d505ca16160567f109cc23478580d157da897f134989df1d563e55f7a5b'
+          '8802f7bc4a589a610118023bdcdd83c10a56dea399acf6eeaac32e8cc10739a8'
         end
       end
       cached(:gdrcopy_service) { platform == 'ubuntu' ? 'gdrdrv' : 'gdrcopy' }