Skip to content

Commit d117c21

Browse files
committed
Support DCV on Alinux2023
1 parent 01080e9 commit d117c21

File tree

6 files changed

+38
-21
lines changed

6 files changed

+38
-21
lines changed

cookbooks/aws-parallelcluster-platform/attributes/platform.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
default['cluster']['dcv']['authenticator']['private_key'] = "#{node['cluster']['etc_dir']}/ext-auth-private-key.pem"
3333
default['cluster']['dcv']['authenticator']['virtualenv_name'] = "dcv_authenticator_virtualenv"
3434
default['cluster']['dcv']['authenticator']['virtualenv_path'] = "#{node['cluster']['system_pyenv_root']}/versions/#{node['cluster']['python-version']}/envs/#{node['cluster']['dcv']['authenticator']['virtualenv_name']}"
35-
default['cluster']['dcv']['version'] = '2024.0-18131'
35+
default['cluster']['dcv']['version'] = '2024.0-19030'
3636
default['cluster']['dcv_port'] = 8443
3737

38-
default['cluster']['dcv']['server']['version'] = '2024.0.18131-1'
39-
default['cluster']['dcv']['xdcv']['version'] = '2024.0.631-1'
40-
default['cluster']['dcv']['gl']['version'] = '2024.0.1078-1'
41-
default['cluster']['dcv']['web_viewer']['version'] = '2024.0.18131-1'
38+
default['cluster']['dcv']['server']['version'] = '2024.0.19030-1'
39+
default['cluster']['dcv']['xdcv']['version'] = '2024.0.654-1'
40+
default['cluster']['dcv']['gl']['version'] = '2024.0.1096-1'
41+
default['cluster']['dcv']['web_viewer']['version'] = '2024.0.19030-1'
4242

4343
# OpenSSH settings for AWS ParallelCluster instances
4444
default['openssh']['server']['protocol'] = '2'

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_alinux2023.rb

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,17 @@
1919
use 'partial/_dcv_common'
2020
use 'partial/_rhel_common'
2121

22-
# DCV is not supported for AL2023
23-
def dcv_supported?
24-
false
25-
end
22+
action_class do
23+
def pre_install
24+
execute 'Install gnome desktop' do
25+
command 'dnf groupinstall "Desktop" -y'
26+
retries 3
27+
retry_delay 5
28+
end
29+
30+
package "xorg-x11-server-Xorg" do
31+
retries 3
32+
retry_delay 5
33+
end
34+
end
35+
end

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu22.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
def dcv_sha256sum
2323
if arm_instance?
24-
'48bb605dbb5f28af79b94de9239a8c3e7811e9e47078d8985d036915f2a34217'
24+
'065f7f63b8bf92a062c85ea749d7bdbaff66acb4d6404cf31200889f1461b624'
2525
else
26-
'b30a57f5029b9d8acb59db9fc72f1dbc7c6a33d76dbbfe02017cec553c5b86f9'
26+
'd631d48e8b268d91c55cc3c56f59c9aeaba0217bc1f649f8c6c75957d41e011b'
2727
end
2828
end

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu24.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
def dcv_sha256sum
2323
if arm_instance?
24-
'95e4a364a78de6febbdeb877febd998099f59fbb4c4226fe6dd27fa4b5afc809'
24+
'eddd8ef8afbd3e960641b0bde4d3f76faf9e5a1c9b5b40c50da98af62cb53635'
2525
else
26-
'2cebf01c1fb5389d349ba22fdd8a85dec179bbf24c86f252535e8da43fb4c705'
26+
'fbbe1157bed43d0da2c2f0da8c13645649d8eb7d722d9855f052b32c382c9f64'
2727
end
2828
end

cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_dcv_common.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@ def dcv_gpu_accel_supported?
272272
end
273273

274274
def dcv_url
275-
"#{node['cluster']['artifacts_s3_url']}/dependencies/dcv/#{dcv_package}.tgz"
275+
"https://d1uj6qtbmh3dt5.cloudfront.net/2024.0/Servers/#{dcv_package}.tgz"
276+
# "#{node['cluster']['artifacts_s3_url']}/dependencies/dcv/#{dcv_package}.tgz"
276277
end
277278

278279
def dcv_tarball

cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_rhel_common.rb

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,33 @@ def dcv_sha256sum
1818
case el_string
1919
when "amzn2"
2020
# ALINUX2
21-
'894f5a0b2c57bb9433a7124f152b0930d962ab0f2cfc6ea0f1e159893d667e86'
21+
'4b77afb807c4aa87e0ac958223f12887d4fc2f1e95adf313cf42025b94adfed8'
22+
when "amzn2023"
23+
# ALINUX2023
24+
"60001ea60e91513b5c5018c38c2178cb0fac5cd0f15875ccf694ab95d7cfe661"
2225
when "el8"
2326
# RHEL and Rocky8
24-
'7647d00782fb7f14668571f1e48fffa2b8b587d878b7632b03f40bbb92a757ad'
27+
'1f59654f27e5f6c148bdc8520994fe2a150a84650af3bc9fefce7f07ff7d310d'
2528
when "el9"
2629
# RHEL and Rocky9
27-
'f9b2fa95f84059c7168ef924b7ffe8b6f4d0d69e2e39280096d4bf76fdfb597c'
30+
'59ed3e6b2698aad03112d759f8bf9a6ffa6850fdf1072fa4afb4756e7314e19d'
2831
else
2932
''
3033
end
3134
else
3235
case el_string
3336
when "amzn2"
3437
# ALINUX2
35-
'81e85db767e36c36877879e1d3afc0f20127b9bd81b845fc8599feb9abd04f24'
38+
'3b9a0ad9c9d521b8a9f6d5c2db0640bd97413d34fe32d418a8a7fd9cae7cc828'
39+
when "amzn2023"
40+
# ALINUX2023
41+
"35128b988dee4f1f4582bd912dc4764b8712c1f0e3a35082a5da7e039eb7ff92"
3642
when "el8"
3743
# RHEL and Rocky8
38-
'f879513272ac351712814bd969e3862fc7717ada9cfdf1ec227876b0e8ebc77d'
44+
'b9d24624b857d4315bcd5d90047d18d4924940153d98828b67ae78521916dd83'
3945
when "el9"
4046
# RHEL and Rocky9
41-
'5d631b5c0f2f6b21d0e56023432766994e2de5cc13f22c70a954cd643cde5b84'
47+
'473b439f95a3354c99718d97338256a280431c7103b5d4bed0d8d63dfc8f6312'
4248
else
4349
''
4450
end
@@ -47,7 +53,7 @@ def dcv_sha256sum
4753

4854
def el_string
4955
if platform?('amazon')
50-
"amzn2"
56+
"amzn#{node['platform_version'].to_i}"
5157
else
5258
"el#{node['platform_version'].to_i}"
5359
end

0 commit comments

Comments
 (0)