From 44a24448e591652df2d6ed3ff8737f89f5cf6242 Mon Sep 17 00:00:00 2001
From: Himani Deshpande <himanidp@amazon.com>
Date: Wed, 24 Jan 2024 15:28:48 -0500
Subject: [PATCH] [Dependencies] Upgrade NICE DCV to 2023.1-16388

---
 CHANGELOG.md                                   |  5 +++++
 .../attributes/platform.rb                     | 10 +++++-----
 .../resources/dcv/dcv_ubuntu20.rb              |  2 +-
 .../resources/dcv/dcv_ubuntu22.rb              |  2 +-
 .../resources/dcv/partial/_rhel_common.rb      | 18 ++++++++++++------
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0a6a7a4bb..62d1039cfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,11 @@ This file is used to list changes made in each version of the AWS ParallelCluste
   - Libfabric-aws: `libfabric-aws-1.19.0`
   - Rdma-core: `rdma-core-46.0-1`
   - Open MPI: `openmpi40-aws-4.1.6-2` and `openmpi50-aws-5.0.0-11`
+- Upgrade NICE DCV to version `2023.1-16388`.
+  - server: `2023.1.16388-1`
+  - xdcv: `2023.1.565-1`
+  - gl: `2023.1.1047-1`
+  - web_viewer: `2023.1.16388-1`
 
 **BUG FIXES**
 
diff --git a/cookbooks/aws-parallelcluster-platform/attributes/platform.rb b/cookbooks/aws-parallelcluster-platform/attributes/platform.rb
index 32eaee30d4..ab839cb08c 100644
--- a/cookbooks/aws-parallelcluster-platform/attributes/platform.rb
+++ b/cookbooks/aws-parallelcluster-platform/attributes/platform.rb
@@ -24,13 +24,13 @@
 default['cluster']['dcv']['authenticator']['private_key'] = "#{node['cluster']['etc_dir']}/ext-auth-private-key.pem"
 default['cluster']['dcv']['authenticator']['virtualenv_name'] = "dcv_authenticator_virtualenv"
 default['cluster']['dcv']['authenticator']['virtualenv_path'] = "#{node['cluster']['system_pyenv_root']}/versions/#{node['cluster']['python-version']}/envs/#{node['cluster']['dcv']['authenticator']['virtualenv_name']}"
-default['cluster']['dcv']['version'] = '2023.0-15487'
+default['cluster']['dcv']['version'] = '2023.1-16388'
 default['cluster']['dcv_port'] = 8443
 
-default['cluster']['dcv']['server']['version'] = '2023.0.15487-1'
-default['cluster']['dcv']['xdcv']['version'] = '2023.0.551-1'
-default['cluster']['dcv']['gl']['version'] = '2023.0.1039-1'
-default['cluster']['dcv']['web_viewer']['version'] = '2023.0.15487-1'
+default['cluster']['dcv']['server']['version'] = '2023.1.16388-1'
+default['cluster']['dcv']['xdcv']['version'] = '2023.1.565-1'
+default['cluster']['dcv']['gl']['version'] = '2023.1.1047-1'
+default['cluster']['dcv']['web_viewer']['version'] = '2023.1.16388-1'
 
 # OpenSSH settings for AWS ParallelCluster instances
 default['openssh']['server']['protocol'] = '2'
diff --git a/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb b/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb
index b09c45696f..989100797c 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb
@@ -20,5 +20,5 @@
 use 'partial/_ubuntu_common'
 
 def dcv_sha256sum
-  'd944cff02c00d34a56701594b0b2cbbcf9e9f126b4fcbf8de6351d9ac8f38991'
+  '22dcd3c561981794d5170e3002dc9ea7c13ba290c7ed0e2ea910d06b31db3de6'
 end
diff --git a/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu22.rb b/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu22.rb
index fba00bb26f..aa4f225b0b 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu22.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu22.rb
@@ -20,5 +20,5 @@
 use 'partial/_ubuntu_common'
 
 def dcv_sha256sum
-  'f40f896cb0bf8944096a15b7257d0543197700cca5e826de2e00db8a96f16a8a'
+  'debbb6c4e5619a02f6f8c0531cc283739edf94b1a5ad7fec36492573e1bf7ba6'
 end
diff --git a/cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_rhel_common.rb b/cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_rhel_common.rb
index 2832ba273d..335d2e114f 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_rhel_common.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_rhel_common.rb
@@ -17,22 +17,28 @@ def dcv_sha256sum
   if arm_instance?
     case el_string
     when "el7"
-      '37aaaabfe1b8dde83254c738aa562b7eb7b1663cea09a53cedf9dabe5ddbb184'
+      # ALINUX2 and Centos7
+      'e5a8549b35b2c45d960a2b22a521542cb97458c2c7c7d0c2bf0c4045f4f7f974'
     when "el8"
-      'c5366bde8fb49bb41f2bb04e3390e5bda9aa668c0122e4fbf663e9a18c049edf'
+      # RHEL and Rocky8
+      'f0c8ebf9d240846004b5e321d48d90f7d9d2d36a769b9dacf59ea37d51cc5ceb'
     when "el9"
-      '07148327f30dae656b338e24102945830601e85df4e135029b624df1e9ee3c2e'
+      # RHEL and Rocky9
+      'b13e92991427bea4ecdbcf472a64c875abfc08f15e63bc3d935d603ac971975a'
     else
       ''
     end
   else
     case el_string
     when "el7"
-      'e82e434a3f0c5d1a48d7cda2b6100ce51ae250d93b6a17b2fb81ba0fda463b3b'
+      # ALINUX2 and Centos7
+      '400691a92f23c59492896ad4906c5a4a827cdbce53fa6291f5bad43fd47ebd1a'
     when "el8"
-      '28a15bb557f59580f3b58d9bf99430d27d98efbaa9007ab3b2eca46e1a51fa4f'
+      # RHEL and Rocky8
+      'a0d17663c2f8597e329ccbc2edf30fbb04ef4ba7dfefe9cb57badde8b964da7c'
     when "el9"
-      'eb906f41b0a064005499ab6a1be42c8d218a3fbaf9444cb907990aa6171bdea4'
+      # RHEL and Rocky9
+      'b8cb9a398bb2da666426f607627fa2da5173dc4ca93f6180f872cc05ad6fff7a'
     else
       ''
     end