puppet 2.7.19 → 2.7.20.rc1

data/ext/packaging/tasks/gem.rake

@@ -0,0 +1,68 @@
+if @build_gem
+  require 'rubygems/package_task'
+
+  def glob_gem_files
+    gem_files = []
+    gem_excludes_file_list = []
+    gem_excludes_raw = @gem_excludes.nil? ? [] : @gem_excludes.split(' ')
+    gem_excludes_raw << 'ext/packaging'
+    gem_excludes_raw.each do |exclude|
+      if File.directory?(exclude)
+        gem_excludes_file_list += FileList["#{exclude}/**/*"]
+      else
+        gem_excludes_file_list << exclude
+      end
+    end
+    files = FileList[@gem_files.split(' ')]
+    files.each do |file|
+      if File.directory?(file)
+        gem_files += FileList["#{file}/**/*"]
+      else
+        gem_files << file
+      end
+    end
+    gem_files = gem_files - gem_excludes_file_list
+  end
+
+  spec = Gem::Specification.new do |s|
+    s.name = @name                                        unless @name.nil?
+    s.name = @gem_name                                    unless @gem_name.nil?
+    s.version = @gemversion                               unless @gemversion.nil?
+    s.author = @author                                    unless @author.nil?
+    s.email = @email                                      unless @email.nil?
+    s.homepage = @homepage                                unless @homepage.nil?
+    s.summary = @summary                                  unless @summary.nil?
+    s.summary = @gem_summary                              unless @gem_summary.nil?
+    s.description = @description                          unless @description.nil?
+    s.description = @gem_description                      unless @gem_description.nil?
+    s.files = glob_gem_files                              unless glob_gem_files.nil?
+    s.executables = @gem_executables                      unless @gem_executables.nil?
+    s.require_path = @gem_require_path                    unless @gem_require_path.nil?
+    s.test_files = FileList[@gem_test_files.split(' ')]   unless @gem_test_files.nil?
+    s.rubyforge_project = @gem_forge_project              unless @gem_forge_project.nil?
+
+    @gem_runtime_dependencies.each do |gem, version|
+      s.add_runtime_dependency("#{gem}", "#{version}") unless (version.nil? or version.empty?)
+      s.add_runtime_dependency("#{gem}") if (version.nil? or version.empty?)
+    end unless @gem_runtime_dependencies.nil?
+
+    @gem_devel_dependencies.each do |gem, version|
+      s.add_devel_dependency("#{gem}", "#{version}") unless (version.nil? or version.empty?)
+      s.add_devel_dependency("#{gem}") if (version.nil? or version.empty?)
+    end unless @gem_devel_dependencies.nil?
+
+    @gem_rdoc_options.each do |option|
+      s.rdoc_options << option
+    end unless @gem_rdoc_options.nil?
+  end
+
+  namespace :package do
+    gem_task = Gem::PackageTask.new(spec)
+    desc "Build a gem"
+    task :gem => [ "clean" ] do
+      gem_task.define
+      Rake::Task[:gem].invoke
+      rm_rf "pkg/#{@name}-#{@gemversion}"
+    end
+  end
+end

data/ext/packaging/tasks/ips.rake

@@ -0,0 +1,80 @@
+if @build_ips
+  require 'erb'
+  namespace :package do
+    namespace :ips do
+      workdir = "pkg/ips"
+      proto = workdir + '/proto'
+      repo = workdir + '/repo'
+      pkgs = workdir + '/pkgs'
+      repouri = "file://#{`pwd`.strip + '/' + repo}"
+      artifact = "#{pkgs}/#{@name}@#{@ipsversion}.p5p"
+
+      # Create a source repo
+      # We dont clean the base pkg directory only ips work dir.
+      task :clean do
+        %x[rm -rf #{workdir}]
+      end
+
+      # Create an installation image at ips/proto
+      task :prepare => :clean do
+        check_tool('pkgsend')
+        x %[mkdir -p #{workdir}]
+        x %[gmake -f ext/ips/rules DESTDIR=#{proto} 2>#{workdir}/build.out ]
+      end
+
+      # Process templates and write the initial manifest
+      task :prototmpl do
+        erb("ext/ips/#{@name}.p5m.erb", workdir + '/' + @name + '.p5m.x')
+      end
+
+      # Update manifest to include the installation image information.
+      task :protogen => :prototmpl do
+        x %[pkgsend generate #{proto} >> #{workdir}/#{@name}.p5m.x ]
+        os=%x[uname -p].chomp
+      end
+
+      # Generate and resolve dependency list
+      task :protodeps => :protogen do
+        x %[pkgdepend generate -d #{proto} #{workdir}/#{@name}.p5m.x > #{workdir}/#{@name}.depends ]
+        x %[pkgdepend resolve -m #{workdir}/#{@name}.depends ]
+        x %[cat #{workdir}/#{@name}.depends.res >> #{workdir}/#{@name}.p5m.x]
+      end
+
+      # Mogrify manifest to remove unncecessary info, and other kinds of transforms.
+      task :protomogrify => :protodeps do
+        x %[pkgmogrify ./ext/ips/transforms ./#{workdir}/#{@name}.p5m.x| pkgfmt >> #{workdir}/#{@name}.p5m ]
+      end
+
+      # Generate and resolve dependency list
+      task :license => :protomogrify do
+        x %[cp LICENSE #{proto}/#{@name}.license]
+      end
+
+      # Ensure that our manifest is sane.
+      task :lint => :license do
+        x %[pkglint #{workdir}/#{@name}.p5m]
+      end
+
+      task :package => :lint do
+        x %[rm -rf #{pkgs}]
+        x %[mkdir -p #{pkgs}]
+        x %[pkgrepo create #{repo}]
+        x %[pkgrepo set -s #{repo} publisher/prefix=puppetlabs.com]
+        x %[pkgsend -s #{repouri} publish -d #{proto} --fmri-in-manifest #{workdir}/#{@name}.p5m]
+        x %[rm -f #{artifact}]
+        x %[pkgrecv -s #{repouri} -a -d #{artifact} #{@name}@#{@ipsversion}]
+       end
+
+      task :dry_install do
+        x %[pkg install -nv -g #{artifact} #{@name}@#{@ipsversion}]
+      end
+    end
+
+    desc "Creates an ips version"
+    task :ips do
+      Rake::Task['package:ips:prepare'].invoke
+      Rake::Task['package:ips:package'].invoke
+    end
+
+  end
+end

data/ext/packaging/tasks/mock.rake

@@ -0,0 +1,126 @@
+
+def mock(mock_config, srpm)
+  check_tool('mock')
+  sh "mock -r #{mock_config} #{srpm}"
+end
+
+def srpm_file
+  srpm = Dir["pkg/srpm/*.rpm"][0]
+  check_file(srpm)
+  srpm
+end
+
+def mock_el_family(mock_config)
+  if @build_pe
+    family = mock_config.split('-')[2][/[a-z]+/]
+  else
+    family = mock_config.split('-')[0]
+    family = 'el' if family == 'pl'
+  end
+  family
+end
+
+def mock_el_ver(mock_config)
+  if @build_pe
+    version = mock_config.split('-')[2][/[0-9]+/]
+  else
+    version = mock_config.split('-')[1]
+    version = "f#{version}" if mock_config.split('-')[0] == 'fedora'
+  end
+  version
+end
+
+def mock_arch(mock_config)
+  if @build_pe
+    arch = mock_config.split('-')[3]
+  else
+    arch = mock_config.split('-')[2]
+  end
+end
+
+def build_rpm_with_mock(mocks, is_rc, subdir)
+  mocks.split(' ').each do |mock_config|
+    family  = mock_el_family(mock_config)
+    version = mock_el_ver(mock_config)
+    arch    = mock_arch(mock_config)
+    result  = "/var/lib/mock/#{mock_config}/result/*.rpm"
+
+    mock(mock_config, srpm_file)
+
+    Dir[result].each do |rpm|
+      rpm.strip!
+      unless ENV['RC_OVERRIDE'] == '1'
+        if is_rc == FALSE and rpm =~ /[0-9]+rc[0-9]+\./
+          puts "It looks like you might be trying to ship an RC to the production repos. Leaving rpm in #{result}. Pass RC_OVERRIDE=1 to override."
+          next
+        elsif is_rc and rpm !~ /[0-9]+rc[0-9]+\./
+          puts "It looks like you might be trying to ship a production release to the development repos. Leaving rpm in #{result}. Pass RC_OVERRIDE=1 to override."
+          next
+        end
+      end
+
+      if @build_pe
+        case File.basename(rpm)
+          when /debuginfo/
+            rm_rf(rpm)
+          when /src\.rpm/
+            cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-srpms")
+          when /i.?86/
+            cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-i386")
+          when /x66_64/
+            cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-x86_64")
+          when /noarch/
+            cp_pr(rpm, "pkg/pe/rpm/#{family}-#{version}-i386")
+            ln("pkg/pe/rpm/#{family}-#{version}-i386/#{File.basename(rpm)}", "pkg/pe/rpm/#{family}-#{version}-x86_64/")
+        end
+      else
+        case File.basename(rpm)
+          when /debuginfo/
+            rm_rf(rpm)
+          when /src\.rpm/
+            cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/SRPMS")
+          when /i.?86/
+            cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/i386")
+          when /x86_64/
+            cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/x86_64")
+          when /noarch/
+            cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/i386")
+            ln("pkg/#{family}/#{version}/#{subdir}/i386/#{File.basename(rpm)}", "pkg/#{family}/#{version}/#{subdir}/x86_64/")
+        end
+      end
+    end
+  end
+end
+
+
+namespace :pl do
+  task :setup_el_dirs do
+    if @build_pe
+      %x{mkdir -p pkg/pe/rpm/sles-11-{i586,x86_64,srpms}}
+      %x{mkdir -p pkg/pe/rpm/el-{5,6}-{i386,x86_64,srpms}}
+    else
+      %x{mkdir -p pkg/el/{5,6}/{products,devel,dependencies}/{SRPMS,i386,x86_64}}
+      %x{mkdir -p pkg/fedora/{f15,f16,f17}/{products,devel,dependencies}/{SRPMS,i386,x86_64}}
+    end
+  end
+
+  desc "Use default mock to make a final rpm, keyed to PL infrastructure, pass MOCK to specify config"
+  task :mock => [ "package:srpm", "pl:setup_el_dirs" ] do
+    # If default mock isn't specified, just take the first one in the @final_mocks list
+    @default_mock ||= @final_mocks.split(' ')[0]
+    subdir = ENV['subdir'] || 'products'
+    build_rpm_with_mock(@default_mock, FALSE, subdir)
+  end
+
+  desc "Use specified mocks to make final rpms, keyed to PL infrastructure, pass MOCK to specifiy config"
+  task :mock_final => [ "package:srpm", "pl:setup_el_dirs" ] do
+    subdir = ENV['subdir'] || 'products'
+    build_rpm_with_mock(@final_mocks, FALSE, subdir)
+  end
+
+  desc "Use specified mocks to make RC rpms, keyed to PL infrastructure, pass MOCK to specify config"
+  task :mock_rc => [ "package:srpm", "pl:setup_el_dirs" ] do
+    subdir = 'devel'
+    build_rpm_with_mock(@rc_mocks, TRUE, subdir)
+  end
+end

data/ext/packaging/tasks/pe_deb.rake

@@ -0,0 +1,9 @@
+if @build_pe
+  namespace :pe do
+    desc "Create a PE deb from this repo using the default cow #{@default_cow}."
+    task :local_deb => "pl:deb"
+
+    desc "Create PE debs from this git repository using all cows specified in build_defaults yaml"
+    task :local_deb_all => "pl:deb_all"
+  end
+end

data/ext/packaging/tasks/pe_remote.rake

@@ -0,0 +1,45 @@
+if @build_pe
+  namespace :pe do
+    desc "Execute remote debian build using default cow on builder and retrieve package"
+    task :deb => ['pl:fetch', 'pl:load_extras'] do
+      ENV['PE_VER'] ||= @pe_version
+      check_var('PE_VER', ENV['PE_VER'])
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@deb_build_host, 'HEAD', "pe:local_deb PE_VER=#{ENV['PE_VER']}")
+    end
+
+    desc "Execute remote debian build using ALL cows on builder and retrieve packages"
+    task :deb_all => ['pl:fetch', 'pl:load_extras'] do
+      ENV['PE_VER'] ||= @pe_version
+      check_var('PE_VER', ENV['PE_VER'])
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@deb_build_host, 'HEAD', "pe:local_deb_all PE_VER=#{ENV['PE_VER']}")
+    end
+
+    desc "Execute remote rpm build using default mock on builder and retrieve package"
+    task :mock => ['pl:fetch', 'pl:load_extras'] do
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@rpm_build_host, 'HEAD', "pe:local_mock TEAM=#{@team}")
+    end
+
+    desc "Execute remote rpm build with ALL mocks on builder and retrieve packages"
+    task :mock_all => ['pl:fetch', 'pl:load_extras'] do
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@rpm_build_host, 'HEAD', "pe:local_mock_final TEAM=#{@team}")
+    end
+
+    desc "Execute remote sles rpm build and retrieve package"
+    task :sles => ['pl:fetch', 'pl:load_extras'] do
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@sles_build_host, 'HEAD', "pe:local_sles TEAM=#{@team}")
+    end
+
+    desc "Execute remote debian, el, and sles builds, sign, and ship pkgs"
+    task :all => ['clean', 'pl:fetch', 'pl:load_extras'] do
+      ['pe:deb', 'pe:mock_all', 'pe:sles', 'pe:ship_rpms', 'pe:ship_debs'].each do |task|
+        Rake::Task[task].execute
+      end
+    end
+  end
+end
+

data/ext/packaging/tasks/pe_rpm.rake

@@ -0,0 +1,21 @@
+if @build_pe
+  namespace :pe do
+    desc "Build a PE rpm using rpmbuild (requires all BuildRequires, rpmbuild, etc)"
+    task :local_rpm => "package:rpm"
+
+    desc "Build rpms using ALL final mocks in build_defaults yaml, keyed to PL infrastructure, pass MOCK to override"
+    task :local_mock_final => ["pl:fetch", "pl:load_extras", "pl:mock_final"] do
+      if @team == 'release'
+        Rake::Task["pe:sign_rpms"].invoke
+      end
+    end
+
+    desc "Build a PE rpm using the default mock"
+    task :local_mock => ["pl:fetch", "pl:load_extras", "pl:mock" ] do
+      if @team == 'release'
+        Rake::Task["pe:sign_rpms"].invoke
+      end
+    end
+  end
+end
+

data/ext/packaging/tasks/pe_ship.rake

@@ -0,0 +1,30 @@
+if @build_pe
+  namespace :pe do
+    desc "ship PE rpms to #{@yum_host}"
+    task :ship_rpms => ["pl:load_extras"] do
+      rsync_to('pkg/pe/rpm/', @yum_host, "#{@yum_repo_path}/#{@pe_version}/repos/")
+      Rake::Task["pe:remote_update_yum_repo"].invoke
+    end
+
+    desc "Update remote rpm repodata for PE on #{@yum_host}"
+    task :remote_update_yum_repo => "pl:load_extras" do
+      remote_ssh_cmd(@yum_host, "for dir in  $(find #{@apt_repo_path}/#{@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
+
+    desc "Ship PE debs to #{@apt_host}"
+    task :ship_debs => "pl:load_extras" do
+      dist = @default_cow.split('-')[1]
+      if Dir["pkg/pe/deb/#{dist}/*"].empty?
+        STDERR.puts "The pkg/pe/deb/#{dist} directory has no packages. Did you run rake pe:deb?"
+      else
+        rsync_to("pkg/pe/deb/#{dist}/", @apt_host, "#{@apt_repo_path}/#{@pe_version}/repos/incoming/unified/")
+        Rake::Task["pe:remote_freight"].invoke
+      end
+    end
+
+    desc "remote freight PE packages to #{@apt_host}"
+    task :remote_freight => "pl:load_extras" do
+      remote_ssh_cmd(@apt_host, "sudo pe-the-things #{@pe_version} #{@apt_repo_path} #{@freight_conf}")
+    end
+  end
+end

data/ext/packaging/tasks/pe_sign.rake

@@ -0,0 +1,27 @@
+# The sign_el5 and sign_modern methods are defined in sign.rake
+# This is just adapted for the 'PE' layout
+
+namespace :pe do
+  desc "Sign all staged in rpms in pkg"
+  task :sign_rpms do
+    old_rpms = FileList.new
+    modern_rpms = FileList.new
+    sign_dists = 'el5', 'el6', 'sles11'
+    ['i386', 'x86_64'].each do |arch|
+      sign_dists.each do |dist|
+        family=dist[/[a-z]+/]
+        version=dist[/[0-9]+/]
+        rpm_stagedir        = "pkg/pe/rpm/#{family}-#{version}-#{arch}/*.rpm"
+        srpm_stagedir       = "pkg/pe/rpm/#{family}-#{version}-srpms/*.rpm"
+        if family == 'el' and version == '6'
+          modern_rpms += FileList[rpm_stagedir] + FileList[srpm_stagedir]
+        else
+          old_rpms += FileList[rpm_stagedir] + FileList[srpm_stagedir]
+        end
+      end
+    end
+    sign_el5(old_rpms) unless old_rpms.empty?
+    sign_modern(modern_rpms) unless modern_rpms.empty?
+  end
+end
+

data/ext/packaging/tasks/pe_sles.rake

@@ -0,0 +1,96 @@
+# tasks for sles building
+
+# take a tarball and stage it in a temp dir with appropriate
+# directories/files set up for building an rpm.
+# return the directory
+
+if @build_pe
+  def prep_sles_dir
+    temp = get_temp
+    check_file("pkg/#{@name}-#{@version}.tar.gz")
+    mkdir_pr temp, "#{temp}/SOURCES", "#{temp}/SPECS"
+    if @sign_tar
+      Rake::Task["pl:sign_tar"].invoke
+      cp_p "pkg/#{@name}-#{@version}.tar.gz.asc", "#{temp}/SOURCES"
+    end
+    cp_p "pkg/#{@name}-#{@version}.tar.gz", "#{temp}/SOURCES"
+    erb "ext/redhat/#{@name}.spec.erb", "#{temp}/SPECS/#{@name}.spec"
+    temp
+  end
+
+  namespace :pe do
+    # Temporary task to pull down pe dependencies until this is NFS-mounted
+    task :retrieve_sles_deps => 'pl:load_extras' do
+      rsync_from("#{@sles_repo_path}/#{@pe_version}/repos/sles-*", @sles_repo_host, "#{ENV['HOME']}/package_repos/")
+      FileList["#{ENV['HOME']}/package_repos/*"].each do |f|
+        update_rpm_repo(f) if File.directory?(f)
+      end
+      cd "#{ENV['HOME']}/package_repos" do
+        unless File.symlink?('sles-11-i586')
+          if File.exist?('sles-11-i586')
+            rm_rf 'sles-11-i586'
+          end
+          File.symlink('sles-11-i386', 'sles-11-i586')
+        end
+      end
+    end
+
+    # pl:setup_el_dirs is defined in mock.rake
+    desc "Build a sles rpm from this repo"
+    task :local_sles => ['package:tar', 'pl:setup_el_dirs', 'pl:fetch', 'pl:load_extras', 'pe:retrieve_sles_deps'] do
+      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}/#{@name}.spec"
+      build_dest_dir    = "usr/src/packages"
+      noarch            = FALSE
+      build_dep_dir     = @sles_build_deps_dir
+      build_os_dep_dir  = @sles_build_iso_dir
+      built_arch        = ''
+      @sles_arch_repos.each do |arch, deps_repo|
+        if noarch == FALSE
+          linux_cmd = arch == 'i586' ? 'linux32' : 'linux64'
+          sh "yes | sudo #{linux_cmd} build \
+            --rpms        #{deps_repo}:#{ENV['HOME']}/package_repos/sles-11-#{arch} \
+            --root        #{build_root}/#{arch}                                     \
+            --rsync-src   #{build_source_dir}                                       \
+            --rsync-dest  /usr/src/packages/SOURCES                                 \
+            --no-checks   #{build_spec}                                             \
+            --arch        #{arch} || true"
+          rpms = FileList["#{build_root}/#{arch}/#{build_dest_dir}/RPMS/**/*.rpm"]
+          srpms = FileList["#{build_root}/#{arch}/#{build_dest_dir}/SRPMS/**/*.rpm"]
+          if rpms.empty?
+            STDERR.puts "No RPMS were built. Perhaps an error occurred?"
+            exit 1
+          end
+          built_arch = arch
+          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
+        else
+          arches_to_copy_to = @sles_arch_repos.keys - [ built_arch ]
+          arches_to_copy_to.each do |other_arch|
+            cp FileList["pkg/pe/rpm/sles-11-#{built_arch}/*"], "pkg/pe/rpm/sles-11-#{other_arch}"
+          end
+        end
+      end
+      cd 'pkg/pe/rpm' do
+        if File.exist?('sles-11-i586')
+          mkdir_p 'sles-11-i386'
+          cp FileList["sles-11-i586/*"], 'sles-11-i386'
+          rm_rf 'sles-11-i586'
+        end
+      end
+      if @team == 'release'
+        Rake::Task["pe:sign_rpms"].invoke
+      end
+    end
+  end
+end
+