packaging 0.99.35 → 0.99.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96cc35674bee0a3c3ca29176ad645ea76dfa493d34ebc555f2a167f60362f5ca
-  data.tar.gz: 2c2868423e895361f84c81fa643f55e35acc08095c0396019758cd835bacbf57
+  metadata.gz: 90069d4b887fc7918e267ea61f847be27e82531e871d839681a802c148ab00d5
+  data.tar.gz: 41ced9146c0dc64652333d7b574c9ab527bf3e52b7953ce4bd87ccf38497de8d
 SHA512:
-  metadata.gz: d7d96ecf671d935aa409bcb6be995bf60c14331727a30e4ab94ab3032a573383a5172ab2fbe55160a7c66fad58588cfca2885242004606988a7456b1e501c703
-  data.tar.gz: 84522235b00d2d1e1ea66a26f0da5c14315e95407b5b97d1ea5a8f275960868452a059332c6953b51cf4aa6051a70a6f4b25dc53e9d7f16a183e2f8dd06d332d
+  metadata.gz: 809e163034d7e756a3d6ddb0e225d05d1fb23c741dad910621ccf90d5f96226653651fbeec0feb1155ffc8ab5204fc3875ccb9c2fb4dc749b0ed1e8291b12ad3
+  data.tar.gz: 303cb33f6f6191bf3c7da7e0c23e490609a86245c8631d81c16a557ce06ccc8a6a284d1ba99461e01043605adab4a9b8efa2cc3ae983aac7d090c9d15aba5742

data/lib/packaging/deb/repo.rb

@@ -159,27 +159,28 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
       dists = Pkg::Util::File.directories("#{target}/apt")
       supported_codenames = Pkg::Platforms.codenames
 
-      if dists
-        dists.each do |dist|
-          next unless supported_codenames.include?(dist)
-          arches = Pkg::Platforms.arches_for_codename(dist)
-          Dir.chdir("#{target}/apt/#{dist}") do
-            File.open("conf/distributions", "w") do |f|
-              f.puts "Origin: Puppet Labs
+      unless dists
+        warn "No repos found to sign. Maybe you didn't build any debs, or the repo creation failed?"
+        return
+      end
+
+      dists.each do |dist|
+        next unless supported_codenames.include?(dist)
+        arches = Pkg::Platforms.arches_for_codename(dist)
+        Dir.chdir("#{target}/apt/#{dist}") do
+          File.open("conf/distributions", "w") do |f|
+            f.puts "Origin: Puppet Labs
 Label: Puppet Labs
 Codename: #{dist}
 Architectures: #{(DEBIAN_PACKAGING_ARCHES + arches).uniq.join(' ')}
 Components: #{reprepro_repo_name}
 Description: #{message} for #{dist}
 SignWith: #{Pkg::Config.gpg_key}"
-            end
-
-            stdout, _, _ = Pkg::Util::Execution.capture3("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
-            stdout
           end
+
+          stdout, _, _ = Pkg::Util::Execution.capture3("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
+          stdout
         end
-      else
-        warn "No repos found to sign. Maybe you didn't build any debs, or the repo creation failed?"
       end
     end
 

data/lib/packaging/util/net.rb

@@ -64,13 +64,18 @@ module Pkg::Util::Net
       return errs
     end
 
-    def remote_ssh_cmd(target, command, capture_output = false, extra_options = '', fail_fast = true)
+    def remote_ssh_cmd(target, command, capture_output = false, extra_options = '', fail_fast = true, trace = false)  # rubocop:disable Style/ParameterLists
+
       ssh = Pkg::Util::Tool.check_tool('ssh')
 
       # we pass some pretty complicated commands in via ssh. We need this to fail
       # if any part of the remote ssh command fails.
-      command = "set -e; #{command}" if fail_fast
-      cmd = "#{ssh} #{extra_options} -t #{target} '#{command.gsub("'", "'\\\\''")}'"
+      shell_flags = ''
+      shell_flags += 'set -e;' if fail_fast
+      shell_flags += 'set -x;' if trace
+      shell_commands = "#{shell_flags}#{command}"
+
+      cmd = "#{ssh} #{extra_options} -t #{target} '#{shell_commands.gsub("'", "'\\\\''")}'"
 
       # This is NOT a good way to support this functionality.
       # It needs to be refactored into a set of methods that

data/spec/lib/packaging/deb/repo_spec.rb

@@ -128,12 +128,21 @@ describe "Pkg::Deb::Repo" do
     end
 
     it "makes a repo for each dist" do
+      # stub out start_keychain to prevent actual keychain starts.
+      Pkg::Util::Gpg.stub(:start_keychain)
+
       dists = cows.reject { |cow| cow.empty? }
       distfiles = {}
-      reprepro = "/bin/reprepro"
       Pkg::Util::File.should_receive(:directories).with("repos/apt").and_return(dists)
-      Pkg::Util::Tool.should_receive(:check_tool).with("reprepro").and_return(reprepro)
-      Pkg::Util::Execution.should_receive(:capture3).at_least(1).times.with("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
+
+      # Let the keychain command happen if find_tool('keychain') finds it
+      keychain_command = "/usr/bin/keychain -k mine"
+      allow(Pkg::Util::Execution).to receive(:capture3) { keychain_command }
+
+      # Enforce reprepro
+      reprepro_command = "/bin/reprepro"
+      Pkg::Util::Tool.should_receive(:check_tool).with("reprepro").and_return(reprepro_command)
+      Pkg::Util::Execution.should_receive(:capture3).at_least(1).times.with("#{reprepro_command} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
 
       dists.each do |dist|
         distfiles[dist] = double

data/spec/lib/packaging/util/net_spec.rb

@@ -65,26 +65,33 @@ describe "Pkg::Util::Net" do
         Kernel.should_receive(:system).with("#{ssh}  -t foo 'bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
         Pkg::Util::Net.remote_ssh_cmd("foo", "bar", false, '', false)
-     end
+    end
+
+    it "should be able to trace output" do
+        Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
+        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -x;bar'")
+        Pkg::Util::Execution.should_receive(:success?).and_return(true)
+        Pkg::Util::Net.remote_ssh_cmd("foo", "bar", false, '', false, true)
+    end
 
     context "without output captured" do
       it "should execute a command :foo on a host :bar using Kernel" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e; bar'")
+        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
         Pkg::Util::Net.remote_ssh_cmd("foo", "bar")
       end
 
       it "should escape single quotes in the command" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e; b'\\''ar'")
+        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;b'\\''ar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
         Pkg::Util::Net.remote_ssh_cmd("foo", "b'ar")
       end
 
       it "should raise an error if ssh fails" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e; bar'")
+        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(false)
         expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar") }.to raise_error(RuntimeError, /Remote ssh command failed./)
       end
@@ -93,21 +100,21 @@ describe "Pkg::Util::Net" do
     context "with output captured" do
       it "should execute a command :foo on a host :bar using Pkg::Util::Execution.capture3" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e; bar'")
+        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
         Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true)
       end
 
       it "should escape single quotes in the command" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e; b'\\''ar'")
+        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;b'\\''ar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
         Pkg::Util::Net.remote_ssh_cmd("foo", "b'ar", true)
       end
 
       it "should raise an error if ssh fails" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e; bar'")
+        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(false)
         expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true) }.to raise_error(RuntimeError, /Remote ssh command failed./)
       end

data/tasks/pe_ship.rake

@@ -145,11 +145,23 @@ if Pkg::Config.build_pe
         # single line. By breaking it into a series of concatenated strings, we can maintain
         # a semblance of formatting and structure (nevermind readability).
         command  = %(for dir in #{repo_base_path}/{#{rpm_family_and_version.join(",")}}-*; do)
-        command += %(  sudo createrepo --checksum=sha --checkts --update --delta-workers=0 --quiet --database --update $dir; )
+
+        # For (RE-12463), make this less quiet than it has been.
+        # We're trying to find out why its aborting. Preserve the original
+        # so it can be restored.
+        command += %(  sudo createrepo --checksum=sha --checkts --update --delta-workers=0 --database --update $dir; )
+
+        ## Original
+        # command += %(  sudo createrepo --checksum=sha --checkts --update --delta-workers=0 --quiet --database --update $dir; )
+        ##
         command += %(done; )
         command += %(sync)
 
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.yum_host, command)
+        # Again for (RE-12463). Make this more verbose temporarily
+        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.yum_host, command, false, '', true, true)
+
+        ## Original one below
+        # Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.yum_host, command)
       end
 
       desc "Remotely add shipped packages to apt repo on #{Pkg::Config.apt_host}"

data/tasks/ship.rake

@@ -324,7 +324,9 @@ namespace :pl do
   task :ship_gem_to_downloads => 'pl:fetch' do
     unless Pkg::Config.gem_host
       warn 'Value `Pkg::Config.gem_host` not defined; skipping shipping to public Download server'
+      exit
     end
+    fail 'Value `Pkg::Config.gem_path` not defined; skipping shipping to public Download server' unless Pkg::Config.gem_path
 
     Pkg::Util::Execution.retry_on_fail(times: 3) do
       Pkg::Util::Ship.ship_gem('pkg', Pkg::Config.gem_path, platform_independent: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.35
+  version: 0.99.36
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec