20_setupextravars.rake in puppet-2.7.24

- old
+ new

@@ -8,12 +8,11 @@
 namespace :pl do
   task :load_extras, :tempdir do |t, args|
     unless ENV['PARAMS_FILE'] && ENV['PARAMS_FILE'] != ''
       tempdir = args.tempdir
       raise "pl:load_extras requires a directory containing extras data" if tempdir.nil?
-      @build.set_params_from_file("#{tempdir}/team/#{@build.builder_data_file}")
-      @build.set_params_from_file("#{tempdir}/project/#{@build.builder_data_file}")
+      @build.set_params_from_file("#{tempdir}/#{@build.builder_data_file}")
       # Overrideable
       @build.build_pe   = boolean_value(ENV['PE_BUILD']) if ENV['PE_BUILD']
       # right now, puppetdb is the only one to override these, because it needs
       # two sets of cows, one for PE and the other for FOSS
       @build.cows             = ENV['COW']      if ENV['COW']
@@ -24,12 +23,9 @@
       @build.yum_host         = ENV['YUM_HOST'] if ENV['YUM_HOST']
       @build.apt_host         = ENV['APT_HOST'] if ENV['APT_HOST']
       @build.apt_repo_path    = ENV['APT_REPO'] if ENV['APT_REPO']
     end
   end
-end
-if @build.team == 'release'
-  @build.benchmark = TRUE
 end
 
 ##
 # Starting with puppetdb, we'll maintain two separate build-data files, one for
 # PE and the other for FOSS. This is the start to maintaining both PE and FOSS