puppet 2.7.22 → 2.7.23

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

@@ -26,36 +26,37 @@ else
   #
   @build.set_params_from_file('ext/project_data.yaml') if File.readable?('ext/project_data.yaml')
   @build.set_params_from_file('ext/build_defaults.yaml') if File.readable?('ext/build_defaults.yaml')
-
-  # Allow environment variables to override the settings we just read in. These
-  # variables are called out specifically because they are likely to require
-  # overriding in at least some cases.
-  #
-  @build.sign_tar        = boolean_value(ENV['SIGN_TAR']) if ENV['SIGN_TAR']
-  @build.build_gem       = boolean_value(ENV['GEM'])      if ENV['GEM']
-  @build.build_dmg       = boolean_value(ENV['DMG'])      if ENV['DMG']
-  @build.build_ips       = boolean_value(ENV['IPS'])      if ENV['IPS']
-  @build.build_doc       = boolean_value(ENV['DOC'])      if ENV['DOC']
-  @build.build_pe        = boolean_value(ENV['PE_BUILD']) if ENV['PE_BUILD']
-  @build.debug           = boolean_value(ENV['DEBUG'])    if ENV['DEBUG']
-  @build.default_cow     = ENV['COW']                     if ENV['COW']
-  @build.cows            = ENV['COW']                     if ENV['COW']
-  @build.pbuild_conf     = ENV['PBUILDCONF']              if ENV['PBUILDCONF']
-  @build.packager        = ENV['PACKAGER']                if ENV['PACKAGER']
-  @build.default_mock    = ENV['MOCK']                    if ENV['MOCK']
-  @build.final_mocks     = ENV['MOCK']                    if ENV['MOCK']
-  @build.rc_mocks        = ENV['MOCK']                    if ENV['MOCK']
-  @build.gpg_name        = ENV['GPG_NAME']                if ENV['GPG_NAME']
-  @build.gpg_key         = ENV['GPG_KEY']                 if ENV['GPG_KEY']
-  @build.certificate_pem = ENV['CERT_PEM']                if ENV['CERT_PEM']
-  @build.privatekey_pem  = ENV['PRIVATE_PEM']             if ENV['PRIVATE_PEM']
-  @build.yum_host        = ENV['YUM_HOST']                if ENV['YUM_HOST']
-  @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
 
+# Allow environment variables to override the settings we just read in. These
+# variables are called out specifically because they are likely to require
+# overriding in at least some cases.
+#
+@build.sign_tar        = boolean_value(ENV['SIGN_TAR']) if ENV['SIGN_TAR']
+@build.build_gem       = boolean_value(ENV['GEM'])      if ENV['GEM']
+@build.build_dmg       = boolean_value(ENV['DMG'])      if ENV['DMG']
+@build.build_ips       = boolean_value(ENV['IPS'])      if ENV['IPS']
+@build.build_doc       = boolean_value(ENV['DOC'])      if ENV['DOC']
+@build.build_pe        = boolean_value(ENV['PE_BUILD']) if ENV['PE_BUILD']
+@build.debug           = boolean_value(ENV['DEBUG'])    if ENV['DEBUG']
+@build.default_cow     = ENV['COW']                     if ENV['COW']
+@build.cows            = ENV['COW']                     if ENV['COW']
+@build.pbuild_conf     = ENV['PBUILDCONF']              if ENV['PBUILDCONF']
+@build.packager        = ENV['PACKAGER']                if ENV['PACKAGER']
+@build.default_mock    = ENV['MOCK']                    if ENV['MOCK']
+@build.final_mocks     = ENV['MOCK']                    if ENV['MOCK']
+@build.rc_mocks        = ENV['MOCK']                    if ENV['MOCK']
+@build.gpg_name        = ENV['GPG_NAME']                if ENV['GPG_NAME']
+@build.gpg_key         = ENV['GPG_KEY']                 if ENV['GPG_KEY']
+@build.certificate_pem = ENV['CERT_PEM']                if ENV['CERT_PEM']
+@build.privatekey_pem  = ENV['PRIVATE_PEM']             if ENV['PRIVATE_PEM']
+@build.yum_host        = ENV['YUM_HOST']                if ENV['YUM_HOST']
+@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']
+@build.notify          = ENV['NOTIFY']                  if ENV['NOTIFY']
+
 ##
 # These parameters are either generated dynamically by the project, or aren't
 # sufficiently generic/multi-purpose enough to justify being in
@@ -74,6 +75,7 @@ end
 @build.random_mockroot   = ENV['RANDOM_MOCKROOT'] ? boolean_value(ENV['RANDOM_MOCKROOT']) : true
 @keychain_loaded         ||= FALSE
 @build_root              ||= Dir.pwd
+@build.build_date        ||= timestamp('-')
 ##
 # 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
@@ -106,3 +108,13 @@ end
   self.instance_variable_set("@#{param}", value)
 end
 
+##
+# Issue a deprecation warning if the packaging repo wasn't loaded by the loader
+unless @using_loader
+  warn "
+  DEPRECATED: The packaging repo tasks are now loaded by 'packaging.rake'.
+  Please update your Rakefile or loading task to load
+  'ext/packaging/packaging.rake' instead of 'ext/packaging/tasks/*' (25-Jun-2013).
+  "
+end
+

data/ext/packaging/tasks/apple.rake

@@ -9,12 +9,10 @@
 #
 
 # Path to Binaries (Constants)
-TAR           = '/usr/bin/tar'
 CP            = '/bin/cp'
 INSTALL       = '/usr/bin/install'
 DITTO         = '/usr/bin/ditto'
-PACKAGEMAKER  = '/Developer/usr/bin/packagemaker'
-SED           = '/usr/bin/sed'
+PKGBUILD      = '/usr/bin/pkgbuild'
 
 # Setup task to populate all the variables
 task :setup do
@@ -22,8 +20,7 @@ task :setup do
   begin
     @source_files        = data_from_yaml('ext/osx/file_mapping.yaml')
   rescue
-    STDERR.puts "Could not load Apple file mappings from 'ext/osx/file_mapping.yaml'"
-    exit 1
+    fail "Could not load Apple file mappings from 'ext/osx/file_mapping.yaml'"
   end
   @package_name          = @build.project
   @title                 = "#{@build.project}-#{@build.version}"
@@ -60,11 +57,11 @@ def make_directory_tree
   end
 
   if File.exists?('ext/osx/postflight.erb')
-    erb 'ext/osx/postflight.erb', "#{@working_tree["scripts"]}/postflight"
+    erb 'ext/osx/postflight.erb', "#{@working_tree["scripts"]}/postinstall"
   end
 
   if File.exists?('ext/osx/preflight.erb')
-    erb 'ext/osx/preflight.erb', "#{@working_tree["scripts"]}/preflight"
+    erb 'ext/osx/preflight.erb', "#{@working_tree["scripts"]}/preinstall"
   end
 
   if File.exists?('ext/osx/prototype.plist.erb')
@@ -89,20 +86,16 @@ def build_dmg
   dmg_format        = "#{dmg_format_code} #{dmg_format_option}"
   dmg_file          = "#{@title}.dmg"
   package_file      = "#{@title}.pkg"
-  pm_extra_args     = '--verbose --no-recommend --no-relocate'
   package_target_os = '10.4'
 
   # Build .pkg file
-  system("sudo #{PACKAGEMAKER} --root #{@working_tree['working']} \
-    --id #{@reverse_domain} \
-    --filter DS_Store \
-    --target #{package_target_os} \
-    --title #{@title} \
-    --info #{@scratch}/prototype.plist \
+  system("sudo #{PKGBUILD} --root #{@working_tree['working']} \
     --scripts #{@working_tree['scripts']} \
-    --resources #{@working_tree['resources']} \
+    --identifier #{@reverse_domain} \
     --version #{@version} \
-    #{pm_extra_args} --out #{@working_tree['payload']}/#{package_file}")
+    --install-location / \
+    --ownership preserve \
+    #{@working_tree['payload']}/#{package_file}")
 
   # Build .dmg file
   system("sudo hdiutil create -volname #{@title} \
@@ -152,17 +145,17 @@ def pack_source
     end
   end
 
-  # Setup a preflight script and replace variables in the files with
+  # Setup a preinstall script and replace variables in the files with
   # the correct paths.
-  if File.exists?("#{@working_tree['scripts']}/preflight")
-    chmod(0644, "#{@working_tree['scripts']}/preflight")
-    sh "sudo chown root:wheel #{@working_tree['scripts']}/preflight"
+  if File.exists?("#{@working_tree['scripts']}/preinstall")
+    chmod(0755, "#{@working_tree['scripts']}/preinstall")
+    sh "sudo chown root:wheel #{@working_tree['scripts']}/preinstall"
   end
 
-  # Setup a postflight from from the erb created earlier
-  if File.exists?("#{@working_tree['scripts']}/postflight")
-    chmod(0755, "#{@working_tree['scripts']}/postflight")
-    sh "sudo chown root:wheel #{@working_tree['scripts']}/postflight"
+  # Setup a postinstall from from the erb created earlier
+  if File.exists?("#{@working_tree['scripts']}/postinstall")
+    chmod(0755, "#{@working_tree['scripts']}/postinstall")
+    sh "sudo chown root:wheel #{@working_tree['scripts']}/postinstall"
   end
 
   # Do a run through first setting the specified permissions then
@@ -234,9 +227,9 @@ if @build.build_dmg
     desc "Task for building an Apple Package"
     task :apple => [:setup] do
       bench = Benchmark.realtime do
-        # Test for Packagemaker binary
-        raise "Packagemaker must be installed. Please install XCode Tools" unless \
-          File.exists?(PACKAGEMAKER)
+        # Test for pkgbuild binary
+        fail "pkgbuild must be installed." unless \
+          File.exists?(PKGBUILD)
 
         make_directory_tree
         pack_source

data/ext/packaging/tasks/build.rake

@@ -10,6 +10,7 @@ module Build
                       :apt_repo_url,
                       :author,
                       :benchmark,
+                      :build_date,
                       :build_defaults,
                       :build_dmg,
                       :build_doc,
@@ -64,6 +65,7 @@ module Build
                       :jenkins_repo_path,
                       :metrics,
                       :name,
+                      :notify,
                       :project,
                       :origversion,
                       :osx_build_host,
@@ -84,10 +86,6 @@ module Build
                       :rpmversion,
                       :ref,
                       :sign_tar,
-                      :sles_build_host,
-                      :sles_repo_path,
-                      :sles_repo_host,
-                      :sles_arch_repos,
                       :summary,
                       :tar_excludes,
                       :tar_host,
@@ -150,10 +148,7 @@ module Build
     #
     def params_to_yaml(output_dir=nil)
       dir = output_dir.nil? ? get_temp : output_dir
-      unless File.writable?(dir)
-        warn "#{dir} does not exist or is not writable, skipping build params write. Exiting.."
-        exit 1
-      end
+      File.writable?(dir) or fail "#{dir} does not exist or is not writable, skipping build params write. Exiting.."
       params_file = File.join(dir, "#{self.ref}.yaml")
       File.open(params_file, 'w') do |f|
         f.puts params.to_yaml

data/ext/packaging/tasks/deb.rake

@@ -1,22 +1,16 @@
 def pdebuild args
   results_dir = args[:work_dir]
   cow         = args[:cow]
-  devel_repo  = args[:devel]
   set_cow_envs(cow)
-  update_cow(cow, devel_repo)
-  begin
-    sh "pdebuild  --configfile #{@build.pbuild_conf} \
-                  --buildresult #{results_dir} \
-                  --pbuilder cowbuilder -- \
-                  --basepath /var/cache/pbuilder/#{cow}/"
-  rescue Exception => e
-    puts e
-    handle_method_failure('pdebuild', args)
-  end
+  update_cow(cow)
+  sh "pdebuild  --configfile #{@build.pbuild_conf} \
+                --buildresult #{results_dir} \
+                --pbuilder cowbuilder -- \
+                --basepath /var/cache/pbuilder/#{cow}/"
+  $?.success? or fail "Failed to build deb with #{cow}!"
 end
 
-def update_cow(cow, is_rc = nil)
-  ENV['FOSS_DEVEL'] = is_rc.to_s
+def update_cow(cow)
   ENV['PATH'] = "/usr/sbin:#{ENV['PATH']}"
   set_cow_envs(cow)
   retry_on_fail(:times => 3) do
@@ -29,8 +23,7 @@ def debuild args
   begin
     sh "debuild --no-lintian -uc -us"
   rescue
-    STDERR.puts "Something went wrong. Hopefully the backscroll or #{results_dir}/#{@build.project}_#{@build.debversion}.build file has a clue."
-    exit 1
+    fail "Something went wrong. Hopefully the backscroll or #{results_dir}/#{@build.project}_#{@build.debversion}.build file has a clue."
   end
 end
 
@@ -44,17 +37,16 @@ task :prep_deb_tars, :work_dir do |t,args|
   end
 end
 
-task :build_deb, :deb_command, :cow, :devel do |t,args|
+task :build_deb, :deb_command, :cow do |t,args|
   bench = Benchmark.realtime do
     deb_build = args.deb_command
     cow       = args.cow
-    devel     = args.devel
     work_dir  = get_temp
     subdir    = 'pe/' if @build.build_pe
     dest_dir  = "#{@build_root}/pkg/#{subdir}deb/#{cow.split('-')[1] unless cow.nil?}"
     check_tool(deb_build)
     mkdir_p dest_dir
-    deb_args  = { :work_dir => work_dir, :cow => cow, :devel => devel}
+    deb_args  = { :work_dir => work_dir, :cow => cow}
     Rake::Task[:prep_deb_tars].reenable
     Rake::Task[:prep_deb_tars].invoke(work_dir)
     cd "#{work_dir}/#{@build.project}-#{@build.debversion}" do
@@ -80,13 +72,7 @@ namespace :pl do
   desc "Create a deb from this repo using the default cow #{@build.default_cow}."
   task :deb => "package:tar"  do
     check_var('PE_VER', @build.pe_version) if @build.build_pe
-    Rake::Task[:build_deb].invoke('pdebuild', @build.default_cow, is_rc?)
-    post_metrics if @build.benchmark
-  end
-
-  task :deb_rc => "package:tar" do
-    deprecate("pl:deb_rc", "pl:deb")
-    Rake::Task[:build_deb].invoke('pdebuild', @build.default_cow, 'true')
+    Rake::Task[:build_deb].invoke('pdebuild', @build.default_cow)
     post_metrics if @build.benchmark
   end
 
@@ -96,18 +82,8 @@ namespace :pl do
     @build.cows.split(' ').each do |cow|
       Rake::Task["package:tar"].invoke
       Rake::Task[:build_deb].reenable
-      Rake::Task[:build_deb].invoke('pdebuild', cow, is_rc?)
+      Rake::Task[:build_deb].invoke('pdebuild', cow)
     end
     post_metrics if @build.benchmark
   end
-
-  task :deb_all_rc do
-    deprecate("pl:deb_all_rc", "pl:deb_all")
-    @build.cows.split(' ').each do |cow|
-      Rake::Task["package:tar"].invoke
-      Rake::Task[:build_deb].reenable
-      Rake::Task[:build_deb].invoke('pdebuild', cow, 'true')
-    end
-  end
-  post_metrics if @build.benchmark
 end

data/ext/packaging/tasks/deb_repos.rake

@@ -18,14 +18,14 @@ namespace :pl do
       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/#{prefix}deb ] || exit 0 ; "
+      cmd << "[ -d #{artifact_directory}/artifacts/#{prefix}deb ] || exit 1 ; "
       # Descend into the deb directory and obtain the list of distributions
       # we'll be building repos for
       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.
       #
-      cmd << '[ -n "$dists" ] || exit 0 ; '
+      cmd << '[ -n "$dists" ] || exit 1 ; '
       cmd << "pushd #{artifact_directory} ; "
 
       cmd << 'echo "Checking for running repo creation. Will wait if detected." ; '
@@ -52,17 +52,19 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; '
       cmd << "$reprepro includedeb $dist ../../#{prefix}deb/$dist/*.deb ; popd ; done ; "
       cmd << "popd ; popd "
 
-      remote_ssh_cmd(@build.distribution_server, cmd)
+      begin
+        remote_ssh_cmd(@build.distribution_server, cmd)
+        # 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:generate_deb_repo_configs"].execute
 
-      # 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 package repositories, we can generate repo
-      # configurations for use with downstream jobs, acceptance clients, etc.
-      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
+      ensure
+        # Always remove the lock file, even if we've failed
+        remote_ssh_cmd(@build.distribution_server, "rm -f #{artifact_directory}/.lock")
+      end
 
-      # 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
@@ -83,20 +85,15 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; '
       # We use wget to obtain a directory listing of what are presumably our deb repos
       #
       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
+      wget = find_tool("wget") or fail "Could not find `wget` tool. This is needed for composing the debian repo configurations. Install `wget` and try again."
+      # 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
-        warn "Could not find `wget` tool. This is needed for composing the debian repo configurations. Install `wget` and try again."
-        exit 0
+        fail "No debian repos available for #{@build.project} at #{@build.ref}."
       end
 
       # Create apt sources.list files that can be added to hosts for installing
@@ -118,18 +115,13 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; '
 
     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
+      wget = find_tool("wget") or fail "Could not find `wget` tool. This is needed for composing the debian repo configurations. Install `wget` and try again."
+      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
+        fail "Couldn't retrieve deb apt repo configs. See preceding http response for more info."
       end
     end
   end

data/ext/packaging/tasks/fetch.rake

@@ -42,8 +42,7 @@ namespace :pl do
       invoke_task("pl:load_extras", tempdir)
       rm_rf(tempdir)
     rescue
-      STDERR.puts "There was an error fetching the builder extras data."
-      exit 1
+      fail "There was an error fetching the builder extras data."
     end
   end
 end

data/ext/packaging/tasks/jenkins.rake

@@ -91,18 +91,10 @@ namespace :pl do
     #
     task :post_build, :build_task do |t, args|
       # Check for a dirty tree before allowing a remote build that is doomed to unexpected results
-      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
 
       # We use JSON for parsing the json part of the submission to JSON
-      begin
-        require 'json'
-      rescue LoadError
-        warn "Couldn't require 'json'. JSON is required for sanely generating the string we curl to Jenkins."
-        exit 1
-      end
+      require_library_or_fail 'json'
 
       build_task = args.build_task
       ##
@@ -121,7 +113,6 @@ namespace :pl do
         when /dmg|apple/ then "dmg"
         when /gem/ then "gem"
         when /tar/ then "tar"
-        when /sles/ then "sles"
         else raise "Could not determine build type for #{build_task}"
       end
       #
@@ -172,16 +163,18 @@ namespace :pl do
 
       # Call out to the curl_form_data utility method in 00_utils.rake
       #
-      if curl_form_data(trigger_url, args)
-        puts "Build submitted. To view your build results, go to #{job_url}"
-        puts "Your packages will be available at #{@build.distribution_server}:#{@build.jenkins_repo_path}/#{@build.project}/#{@build.ref}"
-      else
-        warn "An error occurred submitting the job to jenkins. Take a look at the preceding http response for more info."
+      begin
+        if curl_form_data(trigger_url, args)
+          puts "Build submitted. To view your build results, go to #{job_url}"
+          puts "Your packages will be available at #{@build.distribution_server}:#{@build.jenkins_repo_path}/#{@build.project}/#{@build.ref}"
+        else
+          fail "An error occurred submitting the job to jenkins. Take a look at the preceding http response for more info."
+        end
+      ensure
+        # Clean up after ourselves
+        rm bundle
+        rm properties
       end
-
-      # Clean up after ourselves
-      rm bundle
-      rm properties
     end
   end
 end
@@ -217,7 +210,7 @@ namespace :pl do
     end
 
     # This does the mocks in parallel
-    desc "Queue pl:mock-all on jenkins builder"
+    desc "Queue pl:mock_all on jenkins builder"
     task :mock_all => "pl:fetch" do
       @build.final_mocks.split(' ').each do |mock|
         @build.default_mock = mock
@@ -226,17 +219,6 @@ namespace :pl do
       end
     end
 
-    desc "Jenkins UBER build: build all the things with jenkins"
-    task :uber_build do
-      uber_tasks = ["jenkins:deb_all", "jenkins:mock_all", "jenkins:tar"]
-      uber_tasks << "jenkins:dmg" if @build.build_dmg
-      uber_tasks << "jenkins:gem" if @build.build_gem
-      uber_tasks.map { |t| "pl:#{t}" }.each do |t|
-        invoke_task(t)
-        sleep 5
-      end
-    end
-
     desc "Retrieve packages built by jenkins, sign, and ship all!"
     task :uber_ship => "pl:fetch" do
       uber_tasks = ["jenkins:retrieve", "jenkins:sign_all", "uber_ship", "remote:freight", "remote:update_yum_repo" ]
@@ -247,21 +229,16 @@ namespace :pl do
 end
 
 ##
-# If this is a PE project, we want PE tasks as well. However, because the
-# PE tasks use :remote as their default (e.g., not namespaced under remote)
-# we have to explicily use the "local" tasks, since these will be local
-# builds on jenkins agents. Also, we support building on SLES for PE, so we
-# add a sles task.
+# If this is a PE project, we want PE tasks as well.
 #
 if @build.build_pe
   namespace :pe do
     namespace :jenkins do
-      tasks << "sles"
       tasks.each do |build_task|
         desc "Queue pe:#{build_task} build on jenkins builder"
         task build_task => "pl:fetch" do
           check_var("PE_VER", @build.pe_version)
-          invoke_task("pl:jenkins:post_build", "pe:local_#{build_task}")
+          invoke_task("pl:jenkins:post_build", "pe:#{build_task}")
         end
       end
 
@@ -274,26 +251,17 @@ if @build.build_pe
         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")
+          invoke_task("pl:jenkins:post_build", "pe:deb")
           sleep 5
         end
       end
 
       # This does the mocks in parallel
-      desc "Queue pe:mock-all on jenkins builder"
+      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)
-        ["tar", "deb_all", "mock_all", "sles"].each do |task|
-          invoke_task("pe:jenkins:#{task}")
+          invoke_task("pl:jenkins:post_build", "pe:mock")
           sleep 5
         end
       end
@@ -333,15 +301,13 @@ namespace :pl do
   namespace :jenkins do
     desc "Trigger a jenkins uri with SHA of HEAD as a string param, requires \"URI\""
     task :post, :uri do |t, args|
-      uri = args.uri || ENV['URI']
-      raise "pl:jenkins:post requires a URI, either via URI= or pl:jenkin:post[URI]" if uri.nil?
+      uri = (args.uri or ENV['URI']) or fail "pl:jenkins:post requires a URI, either via URI= or pl:jenkin:post[URI]"
 
       # We use JSON for parsing the json part of the submission.
       begin
         require 'json'
       rescue LoadError
-        warn "Couldn't require 'json'. JSON is required for sanely generating the string we curl to Jenkins."
-        exit 1
+        fail "Couldn't require 'json'. JSON is required for sanely generating the string we curl to Jenkins."
       end
 
       # Assemble the JSON string for the JSON parameter
@@ -357,7 +323,7 @@ namespace :pl do
       if curl_form_data(uri, args)
         puts "Job triggered at #{uri}."
       else
-        puts "An error occurred attempting to trigger the job at #{uri}. Please see the preceding http response for more info."
+        fail "An error occurred attempting to trigger the job at #{uri}. Please see the preceding http response for more info."
       end
     end
   end