WIP: testing public buckets

Signed-off-by: David Pratt <[email protected]>

Author: davprat

attributes/default.rb

@@ -251,26 +251,28 @@
   )
 end
 
-default['cluster']['mysql']['remove']['packages'] = value_for_platform(
-  'default' => %w(mariadb-libs),
-  'ubuntu' => { 'default' => %w() }
-)
-default['cluster']['mysql']['package']['bucket'] = "parallelcluster-packages-439493970194-us-east-1"
-default['cluster']['mysql']['package']['prefix'] = "mysql-client"
 
+default['cluster']['mysql']['package']['url'] = "https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}/archives"
+default['cluster']['mysql']['package']['root'] = "https://aws-parallelcluster-dev-commercial.s3.amazonaws.com/archives/mysql"
+default['cluster']['mysql']['package']['version'] = "8.0.31-1"
+default['cluster']['mysql']['package']['source-version'] = "8.0.31"
 if arm_instance?
-  default['cluster']['mysql']['package']['file'] = value_for_platform(
-    'default' => "mysql-community-client-8.0.31-1.el7.aarch64.tar.gz"
+  default['cluster']['mysql']['package']['platform'] = value_for_platform(
+    'default' => "el/7/aarch64"
   )
 else
-  default['cluster']['mysql']['package']['file'] = value_for_platform(
-    'default' => "mysql-community-client-8.0.31-1.el7.x86_64.tar.gz",
+  default['cluster']['mysql']['package']['platform'] = value_for_platform(
+    'default' => "el/7/x86_64",
     'ubuntu' => {
-      '20.04' => "mysql-community-client-8.0.31-1ubuntu20.04_amd64.tar.gz",
-      '18.04' => "mysql-community-client-8.0.31-1ubuntu18.04_amd64.tar.gz"
+      '20.04' => "ubuntu/20.04/x86_64",
+      '18.04' => "ubuntu/18.04/x86_64"
     }
   )
 end
+default['cluster']['mysql']['package']['file-name'] = "mysql-community-client-#{node['cluster']['mysql']['package']['version']}.tar.gz"
+default['cluster']['mysql']['package']['archive'] = "#{node['cluster']['mysql']['package']['root']}/#{node['cluster']['mysql']['package']['platform']}/#{node['cluster']['mysql']['package']['file-name']}"
+default['cluster']['mysql']['package']['source'] = "#{node['cluster']['mysql']['package']['root']}/source/mysql-#{node['cluster']['mysql']['package']['source-version']}.tar.gz"
+
 
 # EFA
 default['cluster']['efa']['installer_version'] = '1.18.0'

cookbooks/aws-parallelcluster-install/recipes/install_mysql_client.rb

@@ -27,29 +27,36 @@
     'ubuntu' => { 'default' => "apt install" }
   )
 
-  mysql_source_key = "#{node['cluster']['mysql']['package']['prefix']}/#{node['cluster']['mysql']['package']['file']}"
-  mysql_tar_file = "/tmp/#{node['cluster']['mysql']['package']['file']}"
+  mysql_archive_url = node['cluster']['mysql']['package']['archive']
+  mysql_tar_file = "/tmp/#{node['cluster']['mysql']['package']['file-name']}"
 
-  # # Remove packages that break MySQL installation
-  # package node['cluster']['mysql']['remove']['packages'] do
-  #   action :remove
-  # end
+  remote_file mysql_tar_file do
+    source mysql_archive_url
+    mode '0644'
+    retries 3
+    retry_delay 5
+    not_if { ::File.exist?(mysql_tar_file) }
+  end
 
   bash 'Install MySQL packages' do
     user 'root'
     group 'root'
     cwd '/tmp'
     code <<-MYSQL
       set -e
-      #{node['cluster']['cookbook_virtualenv_path']}/bin/aws s3api get-object \
-                         --bucket "#{node['cluster']['mysql']['package']['bucket']}" \
-                         --key "#{mysql_source_key}" \
-                         --region "#{node['cluster']['region']}" \
-                         "#{mysql_tar_file}"
+
       EXTRACT_DIR=$(mktemp -d --tmpdir mysql.XXXXXXX)
       tar xf "#{mysql_tar_file}" --directory "${EXTRACT_DIR}"
       #{package_installer} ${EXTRACT_DIR}/*
     MYSQL
   end
 
 end
+
+# Add MySQL source file
+template "#{node['cluster']['sources_dir']}/mysql_source_code.txt" do
+  source 'mysql/mysql_source_code.erb'
+  owner 'root'
+  group 'root'
+  mode '0644'
+end

cookbooks/aws-parallelcluster-install/templates/default/mysql/mysql_source_code.erb

@@ -0,0 +1,3 @@
+You can get MySQL source code here:
+
+<%= node['cluster']['mysql']['package']['source'] %>