Fix MySQL validation tests

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

Author: davprat

attributes/default.rb

@@ -264,24 +264,30 @@
 # MySQL Validation
 if arm_instance?
   default['cluster']['mysql']['repository']['packages'] = value_for_platform(
-    'default' => %w(mysql-community-devel mysql-community-libs mysql-community-common mysql-community-client-plugins),
+    'default' => %w(mysql-community-devel mysql-community-libs mysql-community-common mysql-community-client-plugins mysql-community-libs-compat),
     'ubuntu' => {
-      'default' => %w(libmysqlclient-dev libmysqlclient21 mysql-common),
-      '18.04' =>  %w(libmysqlclient-dev libmysqlclient20 mysql-common),
+      'default' => %w(libmysqlclient-dev libmysqlclient21),
+      '18.04' =>  %w(libmysqlclient-dev libmysqlclient20),
     }
   )
-  default['cluster']['mysql']['repository']['expected']['source'] = value_for_platform(
-    'default' => "mysql80-community",
-    'ubuntu' => { 'default' => "http://#{node['cluster']['region']}.ec2.ports.ubuntu.com/ubuntu-ports" }
+  default['cluster']['mysql']['repository']['expected']['version'] = value_for_platform(
+    'default' => "8.0.31",
+    'ubuntu' => {
+      '20.04' => "8.0.30-0ubuntu0.20.04.2",
+      '18.04' => "5.7.39-0ubuntu0.18.04.2"
+    }
   )
 else
   default['cluster']['mysql']['repository']['packages'] = value_for_platform(
-    'default' => %w(mysql-community-devel mysql-community-libs mysql-community-common mysql-community-client-plugins),
+    'default' => %w(mysql-community-devel mysql-community-libs mysql-community-common mysql-community-client-plugins mysql-community-libs-compat),
     'ubuntu' => { 'default' => %w(libmysqlclient-dev libmysqlclient21 mysql-common mysql-community-client-plugins) }
   )
-  default['cluster']['mysql']['repository']['expected']['source'] = value_for_platform(
-    'default' => "mysql80-community",
-    'ubuntu' => { 'default' => "http://repo.mysql.com/apt/ubuntu" }
+  default['cluster']['mysql']['repository']['expected']['version'] = value_for_platform(
+    'default' => "8.0.31",
+    'ubuntu' => {
+      '20.04' => "8.0.31-1ubuntu20.04",
+      '18.04' => "8.0.31-1ubuntu18.04"
+    }
   )
 end
 

cookbooks/aws-parallelcluster-test/libraries/helpers.rb

@@ -259,3 +259,27 @@ def validate_package_source(package, expected_source)
     TEST
   end
 end
+
+def validate_package_version(package, expected_version)
+  case node['platform']
+  when 'amazon', 'centos'
+    test_expression = "$(yum info #{package} | grep 'Version' | awk '{print $3}')"
+  when 'ubuntu'
+    test_expression = "$(apt show #{package} | grep 'Version:' | awk '{print $2}')"
+  else
+    raise "Platform not supported: #{node['platform']}"
+  end
+
+  bash "Check that package #{package} v#{expected_version} is installed" do
+    cwd Chef::Config[:file_cache_path]
+    code <<-TEST
+      echo "Testing package #{package} version"
+      actual_version=#{test_expression}
+      if [ "#{expected_version}" != "${actual_version}" ]; then
+        echo "ERROR Expected package source #{expected_version} for #{package} does not match actual source: ${actual_version}"
+        exit 1
+      fi
+      echo "#{package} correctly installed version #{expected_version}"
+    TEST
+  end
+end

cookbooks/aws-parallelcluster-test/recipes/validate_mysql.rb

@@ -18,9 +18,7 @@
 #
 # Check the repository source of a package
 #
-unless arm_instance? && platform?('ubuntu')
-  Chef::Log.info("Checking for MySql implementation on #{node['platform']}:#{node['kernel']['machine']}")
-  node['cluster']['mysql']['repository']['packages'].each do |pkg|
-    validate_package_source(pkg, node['cluster']['mysql']['repository']['expected']['source'])
-  end
+Chef::Log.info("Checking for MySql implementation on #{node['platform']}:#{node['kernel']['machine']}")
+node['cluster']['mysql']['repository']['packages'].each do |pkg|
+  validate_package_version(pkg, node['cluster']['mysql']['repository']['expected']['version'])
 end