puppet 2.7.22 → 2.7.23

data/ext/packaging/tasks/pe_ship.rake

@@ -2,29 +2,25 @@ if @build.build_pe
   namespace :pe do
     desc "ship PE rpms to #{@build.yum_host}"
     task :ship_rpms => "pl:fetch" do
-      if empty_dir?("pkg/pe/rpm")
-        STDERR.puts "The 'pkg/pe/rpm' directory has no packages. Did you run rake pe:deb?"
-        exit 1
-      else
-        target_path = ENV['YUM_REPO'] ? ENV['YUM_REPO'] : "#{@build.yum_repo_path}/#{@build.pe_version}/repos/"
+      empty_dir?("pkg/pe/rpm") and fail "The 'pkg/pe/rpm' directory has no packages. Did you run rake pe:deb?"
+      target_path = ENV['YUM_REPO'] ? ENV['YUM_REPO'] : "#{@build.yum_repo_path}/#{@build.pe_version}/repos/"
+      retry_on_fail(:times => 3) do
         rsync_to('pkg/pe/rpm/', @build.yum_host, target_path)
-        if @build.team == 'release'
-          Rake::Task["pe:remote:update_yum_repo"].invoke
-        end
+      end
+      if @build.team == 'release'
+        Rake::Task["pe:remote:update_yum_repo"].invoke
       end
     end
 
     desc "Ship PE debs to #{@build.apt_host}"
     task :ship_debs => "pl:fetch" do
-      if empty_dir?("pkg/pe/deb")
-        STDERR.puts "The 'pkg/pe/deb' directory has no packages!"
-        exit 1
-      else
-        target_path = ENV['APT_REPO'] ? ENV['APT_REPO'] : "#{@build.apt_repo_path}/#{@build.pe_version}/repos/incoming/disparate/"
+      empty_dir?("pkg/pe/deb") and fail "The 'pkg/pe/deb' directory has no packages!"
+      target_path = ENV['APT_REPO'] ? ENV['APT_REPO'] : "#{@build.apt_repo_path}/#{@build.pe_version}/repos/incoming/disparate/"
+      retry_on_fail(:times => 3) do
         rsync_to("pkg/pe/deb/", @build.apt_host, target_path)
-        if @build.team == 'release'
-          Rake::Task["pe:remote:freight"].invoke
-        end
+      end
+      if @build.team == 'release'
+        Rake::Task["pe:remote:freight"].invoke
       end
     end
 
@@ -34,12 +30,12 @@ if @build.build_pe
         remote_ssh_cmd(@build.yum_host, "for dir in  $(find #{@build.apt_repo_path}/#{@build.pe_version}/repos/el* -type d | grep -v repodata | grep -v cache | xargs)  ; do   pushd $dir; sudo rm -rf repodata; createrepo -q -d .; popd &> /dev/null ; done; sync")
       end
 
-      # This is particularly hacky. The 'pe-the-things' script resides on the @build.apt_host and takes packages placed
+      # This is hacky. The freight.rb script resides on the @build.apt_host and takes packages placed
       # in the directory/structure shown in the rsync target of pe:ship_debs and adds them to the remote PE
       # freight repository and updates the apt repo metadata
       desc "remote freight PE packages to #{@build.apt_host}"
       task :freight => "pl:fetch" do
-        remote_ssh_cmd(@build.apt_host, "sudo pe-the-things #{@build.pe_version} #{@build.apt_repo_path} #{@build.freight_conf}")
+        remote_ssh_cmd(@build.apt_host, "ruby /opt/enterprise/bin/freight.rb --version #{@build.pe_version} --basedir #{@build.apt_repo_path} --config /etc/freight.conf.d/#{@build.freight_conf}")
       end
     end
   end

data/ext/packaging/tasks/pe_sign.rake

@@ -7,6 +7,9 @@ if @build.build_pe
     task :sign_rpms do
       old_rpms = FileList.new
       modern_rpms = FileList.new
+      # Find x86_64 noarch rpms that have been created as hard links and remove them
+      rm_r Dir["pkg/pe/rpm/*-*-x86_64/*.noarch.rpm"]
+      # We'll sign the remaining noarch
       sign_dists = 'el5', 'el6', 'sles11'
       ['i386', 'x86_64'].each do |arch|
         sign_dists.each do |dist|
@@ -23,6 +26,14 @@ if @build.build_pe
       end
       sign_el5(old_rpms) unless old_rpms.empty?
       sign_modern(modern_rpms) unless modern_rpms.empty?
+      # Now we hardlink them back in
+      Dir["pkg/pe/rpm/*-*-i386/*.noarch.rpm"].each do |rpm|
+        dir = rpm.split('/')[-2]
+        family, version, _arch = dir.split('-')
+        cd File.dirname(rpm) do
+          ln File.basename(rpm), File.join('..', "#{family}-#{version}-x86_64")
+        end
+      end
     end
     # This is essentially a duplicate of the logic in pl:sign_deb_changes, but
     # since the plan is eventually to rip out the PE work, it'll be easier if

data/ext/packaging/tasks/pe_tar.rake

@@ -1,5 +1,5 @@
 ##
 # An alias from pe:tar to package:tar, for easier automation in jenkins.rake
 namespace :pe do
-  task :local_tar => ["package:tar"]
+  task :tar => ["package:tar"]
 end

data/ext/packaging/tasks/release.rake

@@ -1,7 +1,6 @@
 # These tasks are "release" chains that couple as much of the release process for a package as possible
 
 namespace :pl do
-  desc "Release gem, e.g. package:gem, pl:ship_gem"
   task :release_gem do
     invoke_task("package:gem")
     if confirm_ship(FileList["pkg/*.gem"])
@@ -29,7 +28,6 @@ namespace :pl do
     end
   end
 
-  desc "Release deb, e.g. package:tar, pl:{deb_all, sign_deb_changes, ship_debs}"
   task :release_deb do
     load_keychain if has_tool('keychain')
     invoke_task("pl:deb_all")
@@ -59,7 +57,6 @@ namespace :pl do
     end
   end
 
-  desc "Release rpms, e.g. package:tar, pl:{mock_all, sign_rpms, ship_rpms, update_yum_repo}"
   task :release_rpm do
     invoke_task("pl:mock_all")
     invoke_task("pl:sign_rpms")
@@ -70,7 +67,6 @@ namespace :pl do
   end
 
   if File.exist?("#{ENV['HOME']}/.packaging")
-    desc "Release tarball, e.g. package:tar, pl:{sign_tar, ship_tar}"
     task :release_tar => 'pl:fetch' do
       invoke_task("package:tar")
       invoke_task("pl:sign_tar")
@@ -79,7 +75,6 @@ namespace :pl do
       end
     end
 
-    desc "Release dmg, e.g. package:apple, pl:ship_dmg"
     task :release_dmg => 'pl:fetch' do
       sh "rvmsudo rake package:apple"
       if confirm_ship(FileList["pkg/apple/*.dmg"])
@@ -87,7 +82,6 @@ namespace :pl do
       end
     end if @build.build_dmg
 
-    desc "Release ips, e.g. pl:ips, pl:ship_ips"
     task :release_ips => 'pl:fetch' do
       Rake::Task['pl:ips'].invoke
       Rake::Task['pl:ship_ips'].invoke

data/ext/packaging/tasks/remote_build.rake

@@ -4,10 +4,7 @@ if File.exist?("#{ENV['HOME']}/.packaging")
   namespace 'pl' do
     namespace :remote do
       task :build, :host, :treeish, :task, :tar do |t, args|
-        if source_dirty?
-          warn "The source tree is dirty, e.g. there are uncommited changes. Please commit/discard changes and try again."
-          exit 1
-        end
+        fail_on_dirty_source
         host                    = args.host
         treeish                 = args.treeish
         task                    = args.task
@@ -46,19 +43,16 @@ if File.exist?("#{ENV['HOME']}/.packaging")
         Rake::Task["pl:remote:build"].invoke(@build.deb_build_host, 'HEAD', "pl:deb_all")
       end
 
-      desc "Execute pl:deb (single default cow deb package) on remote debian build host (no signing)"
       task :deb => 'pl:fetch' do
         Rake::Task["pl:remote:build"].reenable
         Rake::Task["pl:remote:build"].invoke(@build.deb_build_host, 'HEAD', "pl:deb")
       end
 
-      desc "Execute pl:deb_all on remote debian build host (no signing)"
       task :deb_all => 'pl:fetch' do
         Rake::Task["pl:remote:build"].reenable
         Rake::Task["pl:remote:build"].invoke(@build.deb_build_host, 'HEAD', "pl:deb_all")
       end
 
-      desc "Execute remote pl:release_deb_all full build set on remote debian build host"
       task :release_deb => 'pl:fetch'  do
         Rake::Task["pl:remote:build"].reenable
         Rake::Task["pl:remote:build"].invoke(@build.deb_build_host, 'HEAD', "pl:release_deb")
@@ -82,7 +76,6 @@ if File.exist?("#{ENV['HOME']}/.packaging")
         Rake::Task["pl:remote:build"].invoke(@build.rpm_build_host, 'HEAD', "pl:release_rpm_final")
       end
 
-      desc "Execute remote pl:release_rpm full build set on remote rpm build host"
       task :release_rpm => 'pl:fetch' do
         Rake::Task["pl:remote:build"].reenable
         Rake::Task["pl:remote:build"].invoke(@build.rpm_build_host, 'HEAD', "pl:release_rpm")
@@ -94,25 +87,21 @@ if File.exist?("#{ENV['HOME']}/.packaging")
         Rake::Task["pl:remote:build"].invoke(@build.rpm_build_host, 'HEAD', "pl:mock_final")
       end
 
-      desc "Execute pl:mock (single default mock package) on remote rpm build host (no signing)"
       task :mock => 'pl:fetch' do
         Rake::Task["pl:remote:build"].reenable
         Rake::Task["pl:remote:build"].invoke(@build.rpm_build_host, 'HEAD', "pl:mock")
       end
 
-      desc "Execute pl:mock_all on remote rpm build host (no signing)"
       task :mock_all => 'pl:fetch' do
         Rake::Task["pl:remote:build"].reenable
         Rake::Task["pl:remote:build"].invoke(@build.rpm_build_host, 'HEAD', "pl:mock_all")
       end
 
-      desc "Execute pl:ips on remote ips build host"
       task :ips => 'pl:fetch' do
         Rake::Task["pl:remote:build"].reenable
         Rake::Task["pl:remote:build"].invoke(@build.ips_build_host, 'HEAD', 'pl:ips', 'gtar')
       end if @build.build_ips
 
-      desc "Execute package:apple on remote apple build host"
       task :dmg => 'pl:fetch' do
         # Because we use rvmsudo for apple, we end up replicating the :remote_build task
         host                    = @build.osx_build_host
@@ -154,7 +143,6 @@ if File.exist?("#{ENV['HOME']}/.packaging")
       Rake::Task["pl:remote:update_yum_repo"].invoke
     end
 
-    desc "UBER build: build, sign and ship tar, gem (as applicable), remote dmg, remote deb, remote rpm"
     task :uber_release do
       Rake::Task["package:gem"].invoke if @build.build_gem
       Rake::Task["pl:remote:release_deb"].invoke

data/ext/packaging/tasks/retrieve.rake

@@ -24,7 +24,7 @@ namespace :pl do
         begin
           rsync_from("#{@build.jenkins_repo_path}/#{@build.project}/#{@build.ref}/#{target}/", @build.distribution_server, "pkg/")
         rescue
-          puts "Couldn't download packages from distribution server. Try installing wget!"
+          fail "Couldn't download packages from distribution server. Try installing wget!"
         end
       end
       puts "Packages staged in pkg"

data/ext/packaging/tasks/rpm.rake

@@ -1,32 +1,37 @@
+def prep_rpm_build_dir
+  temp = get_temp
+  mkdir_pr temp, "#{temp}/SOURCES", "#{temp}/SPECS"
+  cp_pr FileList["pkg/#{@build.project}-#{@build.version}.tar.gz*"], "#{temp}/SOURCES"
+  erb "ext/redhat/#{@build.project}.spec.erb", "#{temp}/SPECS/#{@build.project}.spec"
+  temp
+end
+
 def build_rpm(buildarg = "-bs")
   check_tool('rpmbuild')
-  temp = get_temp
+  workdir = prep_rpm_build_dir
   if dist = el_version
     if dist.to_i < 6
       dist_string = "--define \"%dist .el#{dist}"
     end
   end
-  rpm_define = "#{dist_string} --define \"%_topdir  #{temp}\" "
+  rpm_define = "#{dist_string} --define \"%_topdir  #{workdir}\" "
   rpm_old_version = '--define "_source_filedigest_algorithm 1" --define "_binary_filedigest_algorithm 1" \
      --define "_binary_payload w9.gzdio" --define "_source_payload w9.gzdio" \
      --define "_default_patch_fuzz 2"'
   args = rpm_define + ' ' + rpm_old_version
-  mkdir_pr temp, 'pkg/srpm', "#{temp}/SOURCES", "#{temp}/SPECS"
+  mkdir_pr 'pkg/srpm'
   if buildarg == '-ba'
     mkdir_p 'pkg/rpm'
   end
   if @build.sign_tar
     Rake::Task["pl:sign_tar"].invoke
-    cp_p "pkg/#{@build.project}-#{@build.version}.tar.gz.asc", "#{temp}/SOURCES"
   end
-  cp_p "pkg/#{@build.project}-#{@build.version}.tar.gz", "#{temp}/SOURCES"
-  erb "ext/redhat/#{@build.project}.spec.erb", "#{temp}/SPECS/#{@build.project}.spec"
-  sh "rpmbuild #{args} #{buildarg} --nodeps #{temp}/SPECS/#{@build.project}.spec"
-  mv FileList["#{temp}/SRPMS/*.rpm"], "pkg/srpm"
+  sh "rpmbuild #{args} #{buildarg} --nodeps #{workdir}/SPECS/#{@build.project}.spec"
+  mv FileList["#{workdir}/SRPMS/*.rpm"], "pkg/srpm"
   if buildarg == '-ba'
-    mv FileList["#{temp}/RPMS/*/*.rpm"], "pkg/rpm"
+    mv FileList["#{workdir}/RPMS/*/*.rpm"], "pkg/rpm"
   end
-  rm_rf temp
+  rm_rf workdir
   puts
   output = FileList['pkg/*/*.rpm']
   puts "Wrote:"

data/ext/packaging/tasks/rpm_repos.rake

@@ -13,43 +13,44 @@ namespace :pl do
   namespace :jenkins do
     desc "Create yum repositories of built RPM packages for this SHA on the distribution server"
     task :rpm_repos => "pl:fetch" do
-      # Formulate our command string, which will just find directories with rpms
-      # and create and update repositories.
-      #
-      artifact_directory = File.join(@build.jenkins_repo_path, @build.project, @build.ref)
+      begin
+        # Formulate our command string, which will just find directories with rpms
+        # and create and update repositories.
+        #
+        artifact_directory = File.join(@build.jenkins_repo_path, @build.project, @build.ref)
 
-      ##
-      # Test that the artifacts directory exists on the distribution server.
-      # This will give us some more helpful output.
-      #
-      cmd = 'echo "Checking for build artifacts. Will exit if not found." ; '
-      cmd << "[ -d #{artifact_directory}/artifacts ] || exit 0 ; "
+        ##
+        # Test that the artifacts directory exists on the distribution server.
+        # This will give us some more helpful output.
+        #
+        cmd = 'echo "Checking for build artifacts. Will exit if not found." ; '
+        cmd << "[ -d #{artifact_directory}/artifacts ] || exit 1 ; "
 
-      ##
-      # Enter the directory containing the build artifacts and create repos.
-      #
-      cmd << "pushd #{artifact_directory} ; "
-      cmd << 'echo "Checking for running repo creation. Will wait if detected." ; '
-      cmd << "while [ -f .lock ] ; do sleep 1 ; echo -n '.' ; done ; "
-      cmd << 'echo "Setting lock" ; '
-      cmd << "touch .lock ; "
-      cmd << "rsync -avxl artifacts/ repos/ ; pushd repos ; "
-      cmd << "createrepo=$(which createrepo) ; "
-      cmd << 'for repodir in $(find ./ -name "*.rpm" | xargs -I {} dirname {}) ; do '
-      cmd << "pushd $repodir && $createrepo -d --update . && popd ; "
-      cmd << "done ; popd "
-
-      remote_ssh_cmd(@build.distribution_server, cmd)
-
-      # Always remove the lock file, even if we've failed
-      remote_ssh_cmd(@build.distribution_server, "rm -f #{artifact_directory}/.lock")
-
-      # Now that we've created our repositories, we can create the configs for
-      # them
-      Rake::Task["pl:jenkins:generate_rpm_repo_configs"].execute
-
-      # And once they're created, we can ship them
-      Rake::Task["pl:jenkins:ship_repo_configs"].execute
+        ##
+        # Enter the directory containing the build artifacts and create repos.
+        #
+        cmd << "pushd #{artifact_directory} ; "
+        cmd << 'echo "Checking for running repo creation. Will wait if detected." ; '
+        cmd << "while [ -f .lock ] ; do sleep 1 ; echo -n '.' ; done ; "
+        cmd << 'echo "Setting lock" ; '
+        cmd << "touch .lock ; "
+        cmd << "rsync -avxl artifacts/ repos/ ; pushd repos ; "
+        cmd << "createrepo=$(which createrepo) ; "
+        cmd << 'for repodir in $(find ./ -name "*.rpm" | xargs -I {} dirname {}) ; do '
+        cmd << "pushd $repodir && $createrepo -d --update . && popd ; "
+        cmd << "done ; popd "
+
+        remote_ssh_cmd(@build.distribution_server, cmd)
+        # Now that we've created our repositories, we can create the configs for
+        # them
+        Rake::Task["pl:jenkins:generate_rpm_repo_configs"].execute
+
+        # And once they're created, we can ship them
+        Rake::Task["pl:jenkins:ship_repo_configs"].execute
+      ensure
+        # Always remove the lock file, even if we've failed
+        remote_ssh_cmd(@build.distribution_server, "rm -f #{artifact_directory}/.lock")
+      end
     end
 
     # Generate yum configuration files that point to the repositories created
@@ -65,10 +66,7 @@ namespace :pl do
       # We have a hard requirement on wget because of all the download magicks
       # we have to do
       #
-      unless wget = find_tool("wget")
-        warn "Could not find `wget` tool. This is needed for composing the yum repo configurations. Install `wget` and try again."
-        exit 0
-      end
+      wget = find_tool("wget") or fail "Could not find `wget` tool. This is needed for composing the yum repo configurations. Install `wget` and try again."
 
       # This is the standard path to all build artifacts on the distribution
       # server for this commit
@@ -94,10 +92,7 @@ namespace :pl do
         end
       end
 
-      if yum_repos.empty?
-        puts "No rpm repos were found to generate configs from. Exiting.."
-        exit 0
-      end
+      yum_repos.empty? and fail "No rpm repos were found to generate configs from!"
 
       mkdir_p File.join("pkg","repo_configs","rpm")
 
@@ -109,7 +104,6 @@ namespace :pl do
         # We ship a base 'srpm' that gets turned into a repo, but we want to
         # ignore this one because its an extra
         next if url == "#{base_url}srpm/"
-        elements = url.split('/')
 
         dist,version,subdir,arch = url.split('/')[-4..-1]
 
@@ -131,18 +125,13 @@ namespace :pl do
 
     desc "Retrieve rpm yum repository configs from distribution server"
     task :rpm_repo_configs => "pl:fetch" do
-      if wget = find_tool("wget")
-        mkdir_p "pkg/repo_configs"
-        config_url = "#{@build.builds_server}/#{@build.project}/#{@build.ref}/repo_configs/rpm/"
-        begin
-          sh "#{wget} -r -np -nH --cut-dirs 3 -P pkg/repo_configs --reject 'index*' #{config_url}"
-        rescue
-          warn "Couldn't retrieve rpm yum repo configs. See preceding http response for more info."
-          exit 1
-        end
-      else
-        warn "Could not find `wget` tool! wget is required to download the repository configs."
-        exit 1
+      wget = find_tool("wget") or fail "Could not find `wget` tool! wget is required to download the repository configs."
+      mkdir_p "pkg/repo_configs"
+      config_url = "#{@build.builds_server}/#{@build.project}/#{@build.ref}/repo_configs/rpm/"
+      begin
+        sh "#{wget} -r -np -nH --cut-dirs 3 -P pkg/repo_configs --reject 'index*' #{config_url}"
+      rescue
+        fail "Couldn't retrieve rpm yum repo configs. See preceding http response for more info."
       end
     end
   end

data/ext/packaging/tasks/ship.rake

@@ -1,8 +1,12 @@
 namespace :pl do
   desc "Ship mocked rpms to #{@build.yum_host}"
   task :ship_rpms do
-    rsync_to('pkg/el', @build.yum_host, @build.yum_repo_path)
-    rsync_to('pkg/fedora', @build.yum_host, @build.yum_repo_path)
+    retry_on_fail(:times => 3) do
+      rsync_to('pkg/el', @build.yum_host, @build.yum_repo_path)
+    end
+    retry_on_fail(:times => 3) do
+      rsync_to('pkg/fedora', @build.yum_host, @build.yum_repo_path)
+    end
   end
 
   namespace :remote do
@@ -31,7 +35,9 @@ namespace :pl do
 
   desc "Ship cow-built debs to #{@build.apt_host}"
   task :ship_debs do
-    rsync_to('pkg/deb/', @build.apt_host, @build.apt_repo_path)
+    retry_on_fail(:times => 3) do
+      rsync_to('pkg/deb/', @build.apt_host, @build.apt_repo_path)
+    end
   end
 
   namespace :remote do
@@ -45,44 +51,44 @@ namespace :pl do
     remote_ssh_cmd(@build.ips_host, "/usr/sbin/svcadm restart svc:/application/pkg/server")
   end if @build.build_ips
 
-  if File.exist?("#{ENV['HOME']}/.packaging")
-    desc "Upload ips p5p packages to downloads"
-    task :ship_ips => 'pl:fetch' do
-      if Dir['pkg/ips/pkgs/**/*'].empty?
-        STDOUT.puts "There aren't any p5p packages in pkg/ips/pkgs. Maybe something went wrong?"
-      else
-        rsync_to('pkg/ips/pkgs/', @build.ips_package_host, @build.ips_path)
-      end
-    end if @build.build_ips
-  end
+  desc "Upload ips p5p packages to downloads"
+  task :ship_ips => 'pl:fetch' do
+    if Dir['pkg/ips/pkgs/**/*'].empty?
+      STDOUT.puts "There aren't any p5p packages in pkg/ips/pkgs. Maybe something went wrong?"
+    else
+      rsync_to('pkg/ips/pkgs/', @build.ips_package_host, @build.ips_path)
+    end
+  end if @build.build_ips
 
   desc "Ship built gem to rubygems"
   task :ship_gem do
     ship_gem("pkg/#{@build.project}-#{@build.gemversion}.gem")
   end if @build.build_gem
 
-  if File.exist?("#{ENV['HOME']}/.packaging")
-    desc "ship apple dmg to #{@build.yum_host}"
-    task :ship_dmg => 'pl:fetch' do
+  desc "ship apple dmg to #{@build.yum_host}"
+  task :ship_dmg => 'pl:fetch' do
+    retry_on_fail(:times => 3) do
       rsync_to('pkg/apple/*.dmg', @build.yum_host, @build.dmg_path)
-    end if @build.build_dmg
+    end
+  end if @build.build_dmg
 
-    desc "ship tarball and signature to #{@build.tar_host}"
-    task :ship_tar => 'pl:fetch' do
+  desc "ship tarball and signature to #{@build.tar_host}"
+  task :ship_tar => 'pl:fetch' do
+    retry_on_fail(:times => 3) do
       rsync_to("pkg/#{@build.project}-#{@build.version}.tar.gz*", @build.tar_host, @build.tarball_path)
     end
+  end
 
-    desc "UBER ship: ship all the things in pkg"
-    task :uber_ship => 'pl:fetch' do
-      if confirm_ship(FileList["pkg/**/*"])
-        ENV['ANSWER_OVERRIDE'] = 'yes'
-        Rake::Task["pl:ship_gem"].invoke if @build.build_gem
-        Rake::Task["pl:ship_rpms"].invoke
-        Rake::Task["pl:ship_debs"].invoke
-        Rake::Task["pl:ship_dmg"].execute if @build.build_dmg
-        Rake::Task["pl:ship_tar"].execute
-        Rake::Task["pl:jenkins:ship"].invoke("shipped")
-      end
+  desc "UBER ship: ship all the things in pkg"
+  task :uber_ship => 'pl:fetch' do
+    if confirm_ship(FileList["pkg/**/*"])
+      ENV['ANSWER_OVERRIDE'] = 'yes'
+      Rake::Task["pl:ship_gem"].invoke if @build.build_gem
+      Rake::Task["pl:ship_rpms"].invoke
+      Rake::Task["pl:ship_debs"].invoke
+      Rake::Task["pl:ship_dmg"].execute if @build.build_dmg
+      Rake::Task["pl:ship_tar"].execute
+      Rake::Task["pl:jenkins:ship"].invoke("shipped")
     end
   end
 
@@ -98,20 +104,23 @@ namespace :pl do
       invoke_task("pl:fetch")
       target = args.target || "artifacts"
       artifact_dir = "#{@build.jenkins_repo_path}/#{@build.project}/#{@build.ref}/#{target}"
-      remote_ssh_cmd(@build.distribution_server, "mkdir -p #{artifact_dir}")
-      rsync_to("pkg/", @build.distribution_server, "#{artifact_dir}/ --exclude repo_configs")
+      retry_on_fail(:times => 3) do
+        remote_ssh_cmd(@build.distribution_server, "mkdir -p #{artifact_dir}")
+      end
+      retry_on_fail(:times => 3) do
+        rsync_to("pkg/", @build.distribution_server, "#{artifact_dir}/ --exclude repo_configs")
+      end
     end
 
     desc "Ship generated repository configs to the distribution server"
     task :ship_repo_configs do
-      if empty_dir?("pkg/repo_configs")
-        warn "No repo configs have been generated! Try pl:deb_repo_configs or pl:rpm_repo_configs"
-        exit 1
-      end
+      empty_dir?("pkg/repo_configs") and fail "No repo configs have been generated! Try pl:deb_repo_configs or pl:rpm_repo_configs"
       invoke_task("pl:fetch")
       repo_dir = "#{@build.jenkins_repo_path}/#{@build.project}/#{@build.ref}/repo_configs"
       remote_ssh_cmd(@build.distribution_server, "mkdir -p #{repo_dir}")
-      rsync_to("pkg/repo_configs/", @build.distribution_server, repo_dir)
+      retry_on_fail(:times => 3) do
+        rsync_to("pkg/repo_configs/", @build.distribution_server, repo_dir)
+      end
     end
   end
 end