Merge pull request #1136 from puppetlabs/CAT-1442-review-and-fix-the-pipeline-for-apt-module

(CAT-1442)-Fix pipeline for apt module

Author: Ramesh7

spec/acceptance/apt_backports_spec.rb

@@ -11,7 +11,9 @@
     end
 
     it 'applies idempotently' do
-      idempotent_apply(pp)
+      retry_on_error_matching do
+        idempotent_apply(pp)
+      end
     end
 
     it 'provides backports apt sources' do

spec/acceptance/apt_key_provider_spec.rb

@@ -902,9 +902,11 @@ def apply_manifest_twice(manifest_pp)
 
     context 'when refresh => true' do
       it 'updates an expired key' do
-        apply_manifest(refresh_true_pp)
-        # Check key has been updated to new version
-        run_shell(PUPPETLABS_EXP_CHECK_COMMAND.to_s)
+        retry_on_error_matching do
+          apply_manifest(refresh_true_pp)
+          # Check key has been updated to new version
+          run_shell(PUPPETLABS_EXP_CHECK_COMMAND.to_s)
+        end
       end
     end
 

spec/spec_helper_acceptance_local.rb

@@ -2,7 +2,7 @@
 
 UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze
 RETRY_WAIT            = 3
-ERROR_MATCHER         = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}.freeze
+ERROR_MATCHER         = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed|shell failed|apply manifest failed)}.freeze
 MAX_RETRY_COUNT       = 10
 
 RSpec.configure do |c|