Merge pull request #8769 from Dorin-Pleava/PUP-11208/retry_pkg_install_when_exitcode_7

(PUP-11208) Retry pkg install on Solaris

Author: GabrielNagy

lib/puppet/provider/package/pkg.rb

@@ -241,7 +241,17 @@ def install(nofail = false)
     end
     self.unhold if self.properties[:mark] == :hold
     begin
+      tries = 1
+      # pkg install exits with code 7 when the image is currently in use by another process and cannot be modified
       r = exec_cmd(command(:pkg), command, *args, name)
+      while r[:exit] == 7 do
+        if tries > 4
+          raise Puppet::Error, _("Pkg could not install %{name} after %{tries} tries. Aborting run") % { name: name, tries: tries }
+        end
+        sleep 2 ** tries
+        tries += 1
+        r = exec_cmd(command(:pkg), command, *args, name)
+      end
     ensure
       self.hold if @resource[:mark] == :hold
     end

spec/unit/provider/package/pkg_spec.rb

@@ -411,6 +411,20 @@ def self.it_should_respond_to(*actions)
             allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
             provider.insync?(is)
           end
+          
+          it "should try 5 times to install and fail when all tries failed" do
+            allow_any_instance_of(Kernel).to receive(:sleep)
+              
+            expect(provider).to receive(:query).and_return({:ensure => :absent})
+            expect(provider).to receive(:properties).and_return({:mark => :hold})
+            expect(provider).to receive(:unhold)
+            expect(Puppet::Util::Execution).to receive(:execute)
+              .with(['/bin/pkg', 'install', *hash[:flags], 'dummy'], {:failonfail => false, :combine => true}).exactly(5).times
+            allow($CHILD_STATUS).to receive(:exitstatus).and_return(7)
+            expect {
+              provider.update
+            }.to raise_error(Puppet::Error, /Pkg could not install dummy after 5 tries. Aborting run/)
+          end
         end
       end
     end