puppet 2.7.21 → 2.7.22

data/ext/packaging/spec/tasks/00_utils_spec.rb

@@ -15,14 +15,14 @@ describe "00_utils" do
       :get_rpmrelease             => '1',
       :is_rc?                     => false,
     },
-    '0.7.0rc1'                    => {
-      :git_describe_version       => %w{0.7.0rc1},
-      :get_dash_version           => '0.7.0rc1',
-      :get_ips_version            => '0.7.0rc1,3.14159-0',
-      :get_dot_version            => '0.7.0rc1',
-      :get_debversion             => '0.7.0-0.1rc1puppetlabs1',
+    '0.7.0rc10'                    => {
+      :git_describe_version       => %w{0.7.0rc10},
+      :get_dash_version           => '0.7.0rc10',
+      :get_ips_version            => '0.7.0rc10,3.14159-0',
+      :get_dot_version            => '0.7.0rc10',
+      :get_debversion             => '0.7.0-0.1rc10puppetlabs1',
       :get_rpmversion             => '0.7.0',
-      :get_rpmrelease             => '0.1rc1',
+      :get_rpmrelease             => '0.1rc10',
       :is_rc?                     => true,
     },
     '0.7.0-rc1'                   => {

data/ext/packaging/spec/tasks/build_object_spec.rb

@@ -2,6 +2,7 @@
 require 'spec_helper'
 load_task '00_utils.rake'
 load_task 'build.rake'
+require 'yaml'
 
 describe Build::BuildInstance do
   Build_Params = [:apt_host,
@@ -71,6 +72,7 @@ describe Build::BuildInstance do
                   :pe_name,
                   :pe_version,
                   :pg_major_version,
+                  :pre_tar_task,
                   :privatekey_pem,
                   :random_mockroot,
                   :rc_mocks,
@@ -86,6 +88,7 @@ describe Build::BuildInstance do
                   :sles_arch_repos,
                   :summary,
                   :tar_excludes,
+                  :tar_host,
                   :tarball_path,
                   :team,
                   :version,

data/ext/packaging/tasks/00_utils.rake

@@ -92,7 +92,7 @@ def git_sha_or_tag
 end
 
 def get_temp
-  temp = `mktemp -d -t tmpXXXXXX`.strip
+  temp = `mktemp -d -t pkgXXXXXX`.strip
 end
 
 def remote_ssh_cmd target, command
@@ -202,7 +202,7 @@ def get_base_pkg_version
   dash = get_dash_version
   if dash.include?("rc")
     # Grab the rc number
-    rc_num = dash.match(/rc(\d)+/)[1]
+    rc_num = dash.match(/rc(\d+)/)[1]
     ver = dash.sub(/-?rc[0-9]+/, "-0.#{@build.release}rc#{rc_num}").gsub(/(rc[0-9]+)-(\d+)?-?/, '\1.\2')
   else
     ver = dash.gsub('-','.') + "-#{@build.release}"

data/ext/packaging/tasks/10_setupvars.rake

@@ -53,6 +53,7 @@ else
   @build.yum_repo_path   = ENV['YUM_REPO']                if ENV['YUM_REPO']
   @build.apt_host        = ENV['APT_HOST']                if ENV['APT_HOST']
   @build.apt_repo_path   = ENV['APT_REPO']                if ENV['APT_REPO']
+  @build.pe_version      = ENV['PE_VER']                  if ENV['PE_VER']
 end
 
 ##
@@ -77,8 +78,14 @@ end
 # For backwards compatibilty, we set build:@name to build:@project. @name was
 # renamed to @project in an effort to align the variable names with what has
 # been supported for parameter names in the params files.
-#
 @build.name = @build.project
+# We also set @tar_host to @yum_host if @tar_host is not set. This is in
+# another effort to fix dumb mistakes. Early on, we just assumed tarballs would
+# go to @yum_host (why? probably just laziness) but this is not ideal and does
+# not make any sense when looking at the code. Now there's a @tar_host
+# variable, but for backwards compatibility, we'll default back to @yum_host if
+# @tar_host isn't set.
+@build.tar_host ||= @build.yum_host
 
 if @build.debug
   @build.print_params

data/ext/packaging/tasks/build.rake

@@ -74,6 +74,7 @@ module Build
                       :pe_name,
                       :pe_version,
                       :pg_major_version,
+                      :pre_tar_task,
                       :privatekey_pem,
                       :random_mockroot,
                       :rc_mocks,
@@ -89,6 +90,7 @@ module Build
                       :sles_arch_repos,
                       :summary,
                       :tar_excludes,
+                      :tar_host,
                       :tarball_path,
                       :task,
                       :team,

data/ext/packaging/tasks/deb_repos.rake

@@ -12,15 +12,16 @@ namespace :pl do
   namespace :jenkins do
     desc "Create apt repositories of build DEB packages for this SHA on the distributions erver"
     task :deb_repos => "pl:fetch" do
+      prefix = @build.build_pe ? "pe/" : ""
 
       # First, we test that artifacts exist and set up the repos directory
       artifact_directory = File.join(@build.jenkins_repo_path, @build.project, @build.ref)
 
       cmd = 'echo " Checking for deb build artifacts. Will exit if not found.." ; '
-      cmd << "[ -d #{artifact_directory}/artifacts/deb ] || exit 0 ; "
+      cmd << "[ -d #{artifact_directory}/artifacts/#{prefix}deb ] || exit 0 ; "
       # Descend into the deb directory and obtain the list of distributions
       # we'll be building repos for
-      cmd << "pushd #{artifact_directory}/artifacts/deb && dists=$(ls) && popd; "
+      cmd << "pushd #{artifact_directory}/artifacts/#{prefix}deb && dists=$(ls) && popd; "
       # We do one more check here to make sure we actually have distributions
       # to build for. If deb is empty we want to just exit.
       #
@@ -48,7 +49,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; '
       # testing only, we'll just add the debs and ignore source files for now.
       #
       cmd << "reprepro=$(which reprepro) ; "
-      cmd << "$reprepro includedeb $dist ../../deb/$dist/*.deb ; popd ; done ; "
+      cmd << "$reprepro includedeb $dist ../../#{prefix}deb/$dist/*.deb ; popd ; done ; "
       cmd << "popd ; popd "
 
       remote_ssh_cmd(@build.distribution_server, cmd)
@@ -58,7 +59,10 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; '
 
       # Now that we've created our package repositories, we can generate repo
       # configurations for use with downstream jobs, acceptance clients, etc.
-      Rake::Task["pl:jenkins:deb_repo_configs"].execute
+      Rake::Task["pl:jenkins:generate_deb_repo_configs"].execute
+
+      # Now that we've created the repo configs, we can ship them
+      Rake::Task["pl:jenkins:ship_repo_configs"].execute
     end
 
     # Generate apt configuration files that point to the repositories created
@@ -69,20 +73,29 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; '
     # enable clients to install these packages.
     #
     desc "Create apt repository configs for package repos for this sha/tag on the distribution server"
-    task :deb_repo_configs => "pl:fetch" do
+    task :generate_deb_repo_configs => "pl:fetch" do
 
-      # This is the standard path to all build artifacts on the distribution
-      # server for this commit
+      # This is the standard path to all debian build artifact repositories on
+      # the distribution server for this commit
       #
-      artifact_directory = File.join(@build.jenkins_repo_path, @build.project, @build.ref)
+      base_url = "http://#{@build.builds_server}/#{@build.project}/#{@build.ref}/repos/apt/"
 
-      # We obtain the list of distributions in the debian repository with some hackery.
+      # We use wget to obtain a directory listing of what are presumably our deb repos
       #
-      %x{ssh -t #{@build.distribution_server} 'ls #{artifact_directory}/repos/apt'}
-      if $?.success?
-        dists = %x{ssh -t #{@build.distribution_server} 'ls #{artifact_directory}/repos/apt'}.split
+      repo_urls = []
+      if wget = find_tool("wget")
+        # First test if the directory even exists
+        #
+        wget_results = %x{#{wget} --spider -r -l 1 --no-parent #{base_url} 2>&1}
+        if $?.success?
+          # We want to exclude index and robots files and only include the http: prefixed elements
+          repo_urls = wget_results.split.uniq.reject{|x| x=~ /\?|index|robots/}.select{|x| x =~ /http:/}.map{|x| x.chomp('/')}
+        else
+          puts "No debian repos available for #{@build.project} at #{@build.ref}."
+          exit 0
+        end
       else
-        warn "No repos were found to generate configs from. Exiting.."
+        warn "Could not find `wget` tool. This is needed for composing the debian repo configurations. Install `wget` and try again."
         exit 0
       end
 
@@ -91,13 +104,33 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; '
       # file for every distribution.
       #
       mkdir_p File.join("pkg", "repo_configs", "deb")
-      dists.each do |dist|
+      repo_urls.each do |url|
+        # We want to skip the base_url, which wget returns as one of the results
+        next if "#{url}/" == base_url
+        dist = url.split('/').last
         repoconfig = ["# Packages for #{@build.project} built from ref #{@build.ref}",
-                      "deb http://#{@build.builds_server}/#{@build.project}/#{@build.ref}/repos/apt/#{dist} #{dist} main"]
+                      "deb #{url} #{dist} main"]
         config = File.join("pkg", "repo_configs", "deb", "pl-#{@build.project}-#{@build.ref}-#{dist}.list")
         File.open(config, 'w') { |f| f.puts repoconfig }
       end
       puts "Wrote apt repo configs for #{@build.project} at #{@build.ref} to pkg/repo_configs/deb."
     end
+
+    desc "Retrieve debian apt repository configs for this sha"
+    task :deb_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/deb/"
+        begin
+          sh "#{wget} -r -np -nH --cut-dirs 3 -P pkg/repo_configs --reject 'index*' #{config_url}"
+        rescue
+          warn "Couldn't retrieve deb apt 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
+      end
+    end
   end
 end

data/ext/packaging/tasks/jenkins.rake

@@ -178,6 +178,10 @@ namespace :pl do
       else
         warn "An error occurred submitting the job to jenkins. Take a look at the preceding http response for more info."
       end
+
+      # Clean up after ourselves
+      rm bundle
+      rm properties
     end
   end
 end
@@ -261,10 +265,34 @@ if @build.build_pe
         end
       end
 
+      # While pl:remote:deb_all does all cows in serially, with jenkins we
+      # parallelize them. This breaks the cows up and posts a build for all of
+      # them. We have to sleep 5 because jenkins drops the builds when we're
+      # DOSing it with our packaging.
+      desc "Queue pe:deb_all on jenkins builder"
+      task :deb_all => "pl:fetch" do
+        check_var("PE_VER", @build.pe_version)
+        @build.cows.split(' ').each do |cow|
+          @build.default_cow = cow
+          invoke_task("pl:jenkins:post_build", "pe:local_deb")
+          sleep 5
+        end
+      end
+
+      # This does the mocks in parallel
+      desc "Queue pe:mock-all on jenkins builder"
+      task :mock_all => "pl:fetch" do
+        @build.final_mocks.split(' ').each do |mock|
+          @build.default_mock = mock
+          invoke_task("pl:jenkins:post_build", "pe:local_mock")
+          sleep 5
+        end
+      end
+
       desc "Queue builds of all PE packages for this project in Jenkins"
       task :uber_build  => "pl:fetch" do
         check_var("PE_VER", @build.pe_version)
-        ["deb_all", "mock_all", "sles"].each do |task|
+        ["tar", "deb_all", "mock_all", "sles"].each do |task|
           invoke_task("pe:jenkins:#{task}")
           sleep 5
         end
@@ -273,7 +301,7 @@ if @build.build_pe
       desc "Retrieve PE packages built by jenkins, sign, and ship all!"
       task :uber_ship => "pl:fetch" do
         check_var("PE_VER", @build.pe_version)
-        ["pl:jenkins:retrieve", "pe:ship_rpms", "pe:ship_debs"].each do |task|
+        ["pl:jenkins:retrieve", "pl:jenkins:sign_all", "pe:ship_rpms", "pe:ship_debs"].each do |task|
           Rake::Task[task].invoke
         end
         Rake::Task["pl:jenkins:ship"].invoke("shipped")

data/ext/packaging/tasks/mock.rake

@@ -19,6 +19,7 @@
 # pkg/el-5-i386/*.rpm
 
 def mock(mock_config, srpm)
+  configdir = nil
   unless mock = find_tool('mock')
     warn "mock is required for building rpms with mock. Please install mock and try again."
     exit 1
@@ -39,7 +40,7 @@ def mock(mock_config, srpm)
   end
   sh "#{mock} -r #{mock_config} #{srpm}"
   # Clean up the configdir
-  rm_r configdir
+  rm_r configdir unless configdir.nil?
 
   basedir
 end
@@ -124,7 +125,7 @@ def build_rpm_with_mock(mocks, is_rc)
               cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-srpms")
             when /i.?86/
               cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-i386")
-            when /x66_64/
+            when /x86_64/
               cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-x86_64")
             when /noarch/
               cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-i386")

data/ext/packaging/tasks/pe_remote.rake

@@ -44,7 +44,7 @@ if @build.build_pe
 
     desc "Execute remote debian, el, and sles builds, sign, and ship pkgs"
     task :all => ['clean', 'pl:fetch'] do
-      ['pe:deb', 'pe:mock_all', 'pe:sles', 'pe:ship_rpms', 'pe:ship_debs'].each do |task|
+      ['pe:deb_all', 'pe:mock_all', 'pe:sles', 'pe:ship_rpms', 'pe:ship_debs'].each do |task|
         Rake::Task[task].execute
       end
     end

data/ext/packaging/tasks/pe_ship.rake

@@ -16,13 +16,12 @@ if @build.build_pe
 
     desc "Ship PE debs to #{@build.apt_host}"
     task :ship_debs => "pl:fetch" do
-      dist = @build.default_cow.split('-')[1]
-      if empty_dir?("pkg/pe/deb/#{dist}")
-        STDERR.puts "The 'pkg/pe/deb/#{dist}' directory has no packages. Did you run rake pe:deb?"
+      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/unified/"
-        rsync_to("pkg/pe/deb/#{dist}/", @build.apt_host, target_path)
+        target_path = ENV['APT_REPO'] ? ENV['APT_REPO'] : "#{@build.apt_repo_path}/#{@build.pe_version}/repos/incoming/disparate/"
+        rsync_to("pkg/pe/deb/", @build.apt_host, target_path)
         if @build.team == 'release'
           Rake::Task["pe:remote:freight"].invoke
         end

data/ext/packaging/tasks/pe_sign.rake

@@ -24,5 +24,13 @@ if @build.build_pe
       sign_el5(old_rpms) unless old_rpms.empty?
       sign_modern(modern_rpms) unless modern_rpms.empty?
     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
+    # this is a separate task we can pull out later.
+    desc "Sign all debian changes files staged in pkg/pe"
+    task :sign_deb_changes do
+      load_keychain if has_tool('keychain')
+      sign_deb_changes("pkg/pe/deb/*/*.changes") unless Dir["pkg/pe/deb/*/*.changes"].empty?
+    end
   end
 end

data/ext/packaging/tasks/pe_sles.rake

@@ -21,6 +21,7 @@ if @build.build_pe
   namespace :pe do
     # Temporary task to pull down pe dependencies until this is NFS-mounted
     task :retrieve_sles_deps => 'pl:fetch' do
+      rm_rf FileList["#{ENV['HOME']}/package_repos/*"]
       rsync_from("#{@build.sles_repo_path}/#{@build.pe_version}/repos/sles-*", @build.sles_repo_host, "#{ENV['HOME']}/package_repos/")
       FileList["#{ENV['HOME']}/package_repos/*"].each do |f|
         update_rpm_repo(f) if File.directory?(f)
@@ -40,15 +41,15 @@ if @build.build_pe
       check_tool('build')
       check_tool('linux32')
       check_tool('linux64')
-      build_root        = get_temp
-      work_dir          = prep_sles_dir
-      build_source_dir  = "#{work_dir}/SOURCES"
-      build_spec_dir    = "#{work_dir}/SPECS"
-      build_spec        = "#{build_spec_dir}/#{@build.project}.spec"
       build_dest_dir    = "usr/src/packages"
       noarch            = FALSE
       built_arch        = ''
       @build.sles_arch_repos.each do |arch, deps_repo|
+        build_root        = get_temp
+        work_dir          = prep_sles_dir
+        build_source_dir  = "#{work_dir}/SOURCES"
+        build_spec_dir    = "#{work_dir}/SPECS"
+        build_spec        = "#{build_spec_dir}/#{@build.project}.spec"
         if noarch == FALSE
           bench = Benchmark.realtime do
             linux_cmd = arch == 'i586' ? 'linux32' : 'linux64'
@@ -70,8 +71,6 @@ if @build.build_pe
             cp(rpms, "pkg/pe/rpm/sles-11-#{arch}")
             cp(srpms, "pkg/pe/rpm/sles-11-srpms")
             noarch = rpms.exclude(/noarch/).empty?
-            rm_rf build_root
-            rm_rf work_dir
           end
           # See 30_metrics.rake to see what this is doing
           add_metrics({ :dist => 'sles', :bench => bench }) if @build.benchmark
@@ -82,6 +81,8 @@ if @build.build_pe
             cp(FileList["pkg/pe/rpm/sles-11-#{built_arch}/*"], "pkg/pe/rpm/sles-11-#{other_arch}")
           end
         end
+        rm_rf build_root
+        rm_rf work_dir
       end
       post_metrics if @build.benchmark
       cd 'pkg/pe/rpm' do

data/ext/packaging/tasks/retrieve.rake

@@ -16,7 +16,17 @@ namespace :pl do
       target = args.target || "artifacts"
       invoke_task("pl:fetch")
       mkdir_p 'pkg'
-      rsync_from("#{@build.jenkins_repo_path}/#{@build.project}/#{@build.ref}/#{target}/", @build.distribution_server, "pkg/")
+      package_url = "http://#{@build.builds_server}/#{@build.project}/#{@build.ref}/#{target}"
+      if wget=find_tool("wget")
+        sh "#{wget} -r -np -nH --cut-dirs 3 -P pkg --reject 'index*' #{package_url}/"
+      else
+        warn "Could not find `wget` tool. Falling back to rsyncing from #{@build.distribution_server}"
+        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!"
+        end
+      end
       puts "Packages staged in pkg"
     end
   end

data/ext/packaging/tasks/rpm_repos.rake

@@ -46,7 +46,10 @@ namespace :pl do
 
       # Now that we've created our repositories, we can create the configs for
       # them
-      Rake::Task["pl:jenkins:rpm_repo_configs"].invoke
+      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
     end
 
     # Generate yum configuration files that point to the repositories created
@@ -57,70 +60,89 @@ namespace :pl do
     # clients to install these packages.
     #
     desc "Create yum repository configs for package repos for this sha/tag on the distribution server"
-    task :rpm_repo_configs => "pl:fetch" do
+    task :generate_rpm_repo_configs => "pl:fetch" 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
 
       # This is the standard path to all build artifacts on the distribution
       # server for this commit
       #
-      artifact_directory = File.join(@build.jenkins_repo_path, @build.project, @build.ref)
+      base_url = "http://#{@build.builds_server}/#{@build.project}/#{@build.ref}/repos/"
+
       # First check if the artifacts directory exists
       #
-      cmd = "[ -d #{artifact_directory} ] || exit 0 ; "
-      # Descend into the artifacts directory and test if we have any repos
-      #
-      cmd << "pushd #{artifact_directory} ; "
-      cmd << 'echo "Checking if rpm repos exists, will exit if not.." ; '
-      cmd << '[ -n "$(find repos -name "*.rpm")" ] || exit 0 ; '
-      cmd << "pushd repos ; "
 
-      cmd << 'for repo in $(find -name "repodata") ; do dirname $repo >> rpm_configs ; done'
+      # We have to do two checks here - first that there are directories with
+      # repodata folders in them, and second that those same directories also
+      # contain rpms
+      #
+      repo_urls = %x{#{wget} --spider -r -l 5 --no-parent #{base_url} 2>&1}.split.uniq.reject{ |x| x =~ /\?|index/ }.select{|x| x =~ /http:.*repodata\/$/}
 
-      remote_ssh_cmd(@build.distribution_server, cmd)
+      # RPMs will always exist at the same directory level as the repodata
+      # folder, which means if we go up a level we should find rpms
+      #
+      yum_repos = []
+      repo_urls.map{|x| x.chomp('repodata/')}.each do |url|
+        unless %x{#{wget} --spider -r -l 1 --no-parent #{url} 2>&1}.split.uniq.reject{ |x| x =~ /\?|index/ }.select{|x| x =~ /http:.*\.rpm$/}.empty?
+          yum_repos << url
+        end
+      end
 
-      # There's a chance there were simply no rpms to make repos for. If so, we
-      # don't want to proceed.
-      %x{ssh -t #{@build.distribution_server} 'ls #{artifact_directory}/repos/rpm_configs'}
-      unless $?.success?
-        warn "No repos were found to generate configs from. Exiting.."
+      if yum_repos.empty?
+        puts "No rpm repos were found to generate configs from. Exiting.."
         exit 0
       end
-      mkdir_p "pkg"
-      rsync_from("#{artifact_directory}/repos/rpm_configs", @build.distribution_server, "pkg")
 
-      # Clean up the remote configs file
-      remote_ssh_cmd(@build.distribution_server, "rm #{artifact_directory}/repos/rpm_configs")
+      mkdir_p File.join("pkg","repo_configs","rpm")
 
-      if File.exist?(File.join("pkg", "rpm_configs"))
-        mkdir_p File.join("pkg","repo_configs","rpm")
+      # Parse the rpm configs file to generate repository configs. Each line in
+      # the rpm_configs file corresponds with a repo directory on the
+      # distribution server.
+      #
+      yum_repos.each do |url|
+        # 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]
 
-        # Parse the rpm configs file to generate repository configs. Each line in
-        # the rpm_configs file corresponds with a repo directory on the
-        # distribution server.
+        # Create an array of lines that will become our yum config
         #
-        lines = IO.readlines(File.join("pkg","rpm_configs")).map{ |l| l.chomp }.uniq
-        lines.each do |repo|
-          dist,version,subdir,arch = repo.split('/')[1..4]
-
-          # Skip any paths that don't have everything we're looking for, e.g.
-          # the top-level srpms directory that contains the original srpm from
-          # packaging
-          next if dist.nil? or version.nil? or subdir.nil? or arch.nil?
-
-          # Create an array of lines that will become our yum config
-          #
-          config = ["[pl-#{@build.project}-#{@build.ref}]"]
-          config << ["name=PL Repo for #{@build.project} at commit #{@build.ref}"]
-          config << ["baseurl=http://#{@build.builds_server}/#{@build.project}/#{@build.ref}/repos/#{dist}/#{version}/#{subdir}/#{arch}"]
-          config << ["enabled=1"]
-          config << ["gpgcheck=0"]
-
-          # Write the new config to a file under our repo configs dir
-          #
-          config_file = File.join("pkg", "repo_configs", "rpm", "pl-#{@build.project}-#{@build.ref}-#{dist}-#{version}-#{arch}-#{subdir}.repo")
-          File.open(config_file, 'w') { |f| f.puts config }
+        config = ["[pl-#{@build.project}-#{@build.ref}]"]
+        config << ["name=PL Repo for #{@build.project} at commit #{@build.ref}"]
+        config << ["baseurl=#{url}"]
+        config << ["enabled=1"]
+        config << ["gpgcheck=0"]
+
+        # Write the new config to a file under our repo configs dir
+        #
+        config_file = File.join("pkg", "repo_configs", "rpm", "pl-#{@build.project}-#{@build.ref}-#{dist}-#{version}-#{arch}-#{subdir}.repo")
+        File.open(config_file, 'w') { |f| f.puts config }
+      end
+      puts "Wrote yum configuration files for #{@build.project} at #{@build.ref} to pkg/repo_configs/rpm"
+    end
+
+    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
-        rm File.join("pkg","rpm_configs")
-        puts "Wrote yum configuration files for #{@build.project} at #{@build.ref} to pkg/repo_configs/rpm"
+      else
+        warn "Could not find `wget` tool! wget is required to download the repository configs."
+        exit 1
       end
     end
   end