From f542aa539e43dedc18959377dd71b96ab1763f6e Mon Sep 17 00:00:00 2001 From: Ryan Anderson Date: Tue, 8 Aug 2023 14:19:50 -0400 Subject: [PATCH] [Release 3.7] Add ubuntu 22.04 to dcv connect script and mysql client install check --- .../files/dcv/pcluster_dcv_connect.sh | 2 +- .../test/controls/mysql_client_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh b/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh index 415adcbfde..78b2a3dd20 100644 --- a/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh +++ b/cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh @@ -112,7 +112,7 @@ main() { os=$(< /etc/chef/dna.json jq -r .cluster.base_os) _log "Input parameters: user: ${user}, OS: ${os}, shared_folder_path: ${shared_folder_path}." - if ! [[ "${os}" =~ ^(alinux2|ubuntu2004|centos[7-8]|rhel8)$ ]]; then + if ! [[ "${os}" =~ ^(alinux2|ubuntu2004|ubuntu2204|centos[7-8]|rhel8)$ ]]; then _fail "OS not supported." fi diff --git a/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb b/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb index 644aa912c3..35d403e1b8 100644 --- a/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb +++ b/cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb @@ -16,7 +16,7 @@ if os.redhat? mysql_packages.concat %w(mysql-community-client-plugins mysql-community-common mysql-community-devel mysql-community-libs mysql-community-libs-compat) - elsif os_properties.ubuntu2004? + elsif os_properties.ubuntu2004? || os_properties.ubuntu2204? mysql_packages.concat %w(libmysqlclient-dev libmysqlclient21) else describe "unsupported OS" do