refactor(pillar.amazonlinux): shorten suite name to amazon

test/integration/default/controls/gems_spec.rb

@@ -4,10 +4,16 @@
 control 'Wanted/Required gems' do
   title 'should be installed'
 
-  %w[
+  wanted = %w[
     progressbar
     minitest
-  ].each do |p|
+  ]
+  case platform[:name]
+  when 'amazon'
+    wanted.delete('minitest')
+  end
+
+  wanted.each do |p|
     describe gem(p) do
       it { should be_installed }
     end

test/integration/default/controls/pkgs_spec.rb

@@ -11,7 +11,13 @@ common_packages = %w[
 
 case platform[:family]
 when 'redhat'
-  platform_packages = %w[yum-plugin-versionlock]
+  platform_packages =
+    case platform[:name]
+    when 'amazon'
+      %w[git]
+    else
+      %w[yum-plugin-versionlock]
+    end
   held_packages = {
     # We use this test for held packages in a list,
     # with no version (current version).
@@ -20,12 +26,7 @@ when 'redhat'
   }
   lock_file = '/etc/yum/pluginconf.d/versionlock.list'
 when 'fedora'
-  case platform[:release]
+  platform_packages = ['python3-dnf-plugin-versionlock']
-  when '29'
-    platform_packages = ['python2-dnf-plugin-versionlock']
-  when '30'
-    platform_packages = ['python3-dnf-plugin-versionlock']
-  end
   held_packages = {
     'alien': '8.95-8.fc29',
     'iotop': '0.6-18.fc29'
@@ -50,10 +51,6 @@ when 'debian'
     'iotop': '0.6-'
   }
   lock_file = '/var/lib/dpkg/status'
-when 'amazon'
-  common_packages.delete('fail2ban')
-  platform_packages = ['git']
-  held_packages = []
 end
 
 # FIXME: - not testing Held packages

test/salt/pillar/pillar.example.amazon

@@ -1,13 +1,14 @@
 packages:
   pkgs:
-#    held:
+    # held:
-#      - alien
+    #   - alien
-#      - iotop
+    #   - iotop
     wanted:
       - git
       - less
       - bc
       - curl
+      - fail2ban
     unwanted:
       - avahi-daemon
     required:
@@ -24,7 +25,11 @@ packages:
   gems:
     wanted:
       - progressbar
-      - minitest
+      # minitest requires Ruby version ~> 2.2.
+      # ruby 2.0.0p648 (2015-12-16) [x86_64-linux]
+      # https://stackoverflow.com/a/50931910
+      # $ sudo amazon-linux-extras install ruby2.6
+      # - minitest
     unwanted:
       - diff-lcs
       - kitchen-vagrant