test: centralise all suites into default suite

Modify the `default` suite to use the `saltmajorversion` InSpec input
rather than the `version` variable in `pkgs_spec.rb`.

test/integration/v3002-py3/controls/pkgs_spec.rb → test/integration/default/controls/pkgs_spec.rb

@@ -15,12 +15,10 @@
 control 'salt packages' do
   title 'should be installed'
 
-  version = '3002'
-
   pkgs.each do |p|
     describe package(p) do
       it { should be_installed }
-      its('version') { should match(/^#{version}/) }
+      its('version') { should match(/^#{input('saltmajorversion')}/) }
     end
   end
 end

test/integration/v3001-py3/files/_mapdata/debian-9.yaml → test/integration/default/files/_mapdata/debian-9.yaml

@@ -96,7 +96,7 @@ values:
     release: '3001'
     restart_via_at: false
     retry_options:
-      attempts: 2
+      attempts: 5
       interval: 10
       splay: 10
       until: true