puppet 2.7.19 → 2.7.20.rc1

data/ext/packaging/tasks/release.rake

@@ -0,0 +1,73 @@
+# 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"])
+      invoke_task("pl:ship_gem")
+    end
+  end if @build_gem
+
+  desc "Release deb RCs, e.g. package:tar, pl:{deb_all_rc, sign_deb_changes, ship_debs}"
+  task :release_deb_rc do
+    load_keychain if has_tool('keychain')
+    invoke_task("pl:deb_all_rc")
+    invoke_task("pl:sign_deb_changes")
+    if confirm_ship(FileList["pkg/deb/**/*"])
+      invoke_task("pl:ship_debs")
+    end
+  end
+
+  desc "Release deb FINALs, e.g. package:tar, pl:{deb_all, sign_deb_changes, ship_debs}"
+  task :release_deb_final do
+    load_keychain if has_tool('keychain')
+    invoke_task("pl:deb_all")
+    invoke_task("pl:sign_deb_changes")
+    if confirm_ship(FileList["pkg/deb/**/*"])
+      invoke_task("pl:ship_debs")
+    end
+  end
+
+  desc "Release rpm RCs, e.g. package:tar, pl:{mock_rc, sign_rpms, ship_rpms, update_yum_repo}"
+  task :release_rpm_rc do
+    invoke_task("pl:mock_rc")
+    invoke_task("pl:sign_rpms")
+    if confirm_ship(FileList["pkg/el/**/*", "pkg/fedora/**/*"])
+      invoke_task("pl:ship_rpms")
+      invoke_task("pl:remote_update_yum_repo")
+    end
+  end
+
+  desc "Release rpm FINALs, e.g. package:tar, pl:{mock_final, sign_rpms, ship_rpms, update_yum_repo}"
+  task :release_rpm_final do
+    invoke_task("pl:mock_final")
+    invoke_task("pl:sign_rpms")
+    if confirm_ship(FileList["pkg/el/**/*", "pkg/fedora/**/*"])
+      invoke_task("pl:ship_rpms")
+      invoke_task("pl:remote_update_yum_repo")
+    end
+  end
+
+  if File.exist?("#{ENV['HOME']}/.packaging/#{@builder_data_file}")
+    desc "Release tarball, e.g. package:tar, pl:{sign_tar, ship_tar}"
+    task :release_tar => ['pl:fetch', 'pl:load_extras'] do
+      invoke_task("package:tar")
+      invoke_task("pl:sign_tar")
+      if confirm_ship(FileList["pkg/*tar.gz*"])
+        Rake::Task["pl:ship_tar"].execute
+      end
+    end
+
+    desc "Release dmg, e.g. package:apple, pl:ship_dmg"
+    task :release_dmg => ['pl:fetch', 'pl:load_extras'] do
+      sh "rvmsudo rake package:apple"
+      if confirm_ship(FileList["pkg/apple/*.dmg"])
+        Rake::Task["pl:ship_dmg"].execute
+      end
+    end if @build_dmg
+  end
+end
+
+
+

data/ext/packaging/tasks/remote_build.rake

@@ -0,0 +1,78 @@
+# Tasks for remote building on builder hosts
+if File.exist?("#{ENV['HOME']}/.packaging/#{@builder_data_file}")
+  namespace 'pl' do
+    task :remote_build, :host, :treeish, :task do |t, args|
+      host                    = args.host
+      treeish                 = args.treeish
+      task                    = args.task
+      remote_repo             = remote_bootstrap(host, treeish)
+      STDOUT.puts "Beginning package build on #{host}"
+      remote_ssh_cmd(host, "cd #{remote_repo} ; rake #{task} ANSWER_OVERRIDE=no")
+      rsync_from("#{remote_repo}/pkg/", host, 'pkg/')
+      remote_ssh_cmd(host, "rm -rf #{remote_repo}")
+      STDOUT.puts "packages from #{host} staged in pkg/ directory"
+    end
+
+    desc "Execute release_deb_rc full build set on remote debian build host"
+    task :remote_deb_rc => ['pl:fetch', 'pl:load_extras'] do
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@deb_build_host, 'HEAD', "pl:release_deb_rc")
+    end
+
+    desc "Execute release_deb_final full build set on remote debian build host"
+    task :remote_deb_final => ['pl:fetch', 'pl:load_extras'] do
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@deb_build_host, 'HEAD', "pl:release_deb_final")
+    end
+
+    desc "Execute release_rpm_rc full build set on remote rpm build host"
+    task :remote_rpm_rc => ['pl:fetch', 'pl:load_extras'] do
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@rpm_build_host, 'HEAD', "pl:release_rpm_rc")
+    end
+
+    desc "Execute release_deb_final full build set on remote rpm build host"
+    task :remote_rpm_final => ['pl:fetch', 'pl:load_extras'] do
+      Rake::Task["pl:remote_build"].reenable
+      Rake::Task["pl:remote_build"].invoke(@rpm_build_host, 'HEAD', "pl:release_rpm_final")
+    end
+
+    desc "Execute package:apple on remote apple build host"
+    task :remote_dmg => ['pl:fetch', 'pl:load_extras'] do
+      # Because we use rvmsudo for apple, we end up replicating the :remote_build task
+      host                    = @osx_build_host
+      treeish                 = 'HEAD'
+      task                    = "package:apple"
+      remote_repo             = remote_bootstrap(host, treeish)
+      puts "Beginning package build on #{host}"
+      remote_ssh_cmd(host, "cd #{remote_repo} ; rvmsudo rake #{task}")
+      rsync_from("#{remote_repo}/pkg/apple", host, 'pkg/')
+      remote_ssh_cmd(host, "sudo rm -rf #{remote_repo}")
+      STDOUT.puts "packages from #{host} staged in pkg/ directory"
+    end if @build_dmg
+
+    desc "UBER RC build: build and ship RC tar, gem (as applicable), remote dmg, remote deb, remote rpm"
+    task :uber_rc do
+      Rake::Task["package:gem"].invoke if @build_gem
+      Rake::Task["pl:remote_deb_rc"].invoke
+      Rake::Task["pl:remote_rpm_rc"].execute
+      Rake::Task["pl:remote_dmg"].execute if @build_dmg
+      Rake::Task["package:tar"].execute
+      Rake::Task["pl:sign_tar"].invoke
+      Rake::Task["pl:uber_ship"].execute
+      Rake::Task["pl:remote_freight_devel"].invoke
+    end
+
+    desc "UBER FINAL build: build and ship FINAL tar, gem (as applicable), remote dmg, remote deb, remote rpm"
+    task :uber_final do
+      Rake::Task["package:gem"].invoke if @build_gem
+      Rake::Task["pl:remote_deb_final"].invoke
+      Rake::Task["pl:remote_rpm_final"].execute
+      Rake::Task["pl:remote_dmg"].execute if @build_dmg
+      Rake::Task["package:tar"].execute
+      Rake::Task["pl:sign_tar"].invoke
+      Rake::Task["pl:uber_ship"].execute
+      Rake::Task["pl:remote_freight_final"].invoke
+    end
+  end
+end

data/ext/packaging/tasks/rpm.rake

@@ -0,0 +1,52 @@
+def build_rpm(buildarg = "-bs")
+  check_tool('rpmbuild')
+  temp = get_temp
+  dist = find_dist_version
+  rpm_define = "#{dist} --define \"%_topdir  #{temp}\" "
+  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/rpm', 'pkg/srpm', "#{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"
+  sh "rpmbuild #{args} #{buildarg} --nodeps #{temp}/SPECS/#{@name}.spec"
+  mv FileList["#{temp}/SRPMS/*.rpm"], "pkg/srpm"
+  mv FileList["#{temp}/RPMS/*/*.rpm"], "pkg/rpm"
+  rm_rf temp
+  puts
+  output = FileList['pkg/*/*.rpm']
+  puts "Wrote:"
+  output.each do | line |
+    puts line
+  end
+end
+
+def find_dist_version()
+   if File.exists?('/etc/fedora-release')
+      nil
+   elsif File.exists?('/etc/redhat-release')
+      dist = %x{rpm -q --qf \"%{VERSION}\" $(rpm -q --whatprovides /etc/redhat-release )}
+      unless dist.to_i > 5
+        return "--define \"%dist .el#{dist}\""
+      end
+      nil
+   end
+end
+
+namespace :package do
+  desc "Create srpm from this git repository (unsigned)"
+  task :srpm => :tar do
+    build_rpm("-bs")
+  end
+
+  desc "Create .rpm from this git repository (unsigned)"
+  task :rpm => :tar do
+    build_rpm("-ba")
+  end
+end
+

data/ext/packaging/tasks/ship.rake

@@ -0,0 +1,78 @@
+namespace :pl do
+  desc "Ship mocked rpms to #{@yum_host}"
+  task :ship_rpms do
+    rsync_to('pkg/el', @yum_host, @yum_repo_path)
+    rsync_to('pkg/fedora', @yum_host, @yum_repo_path)
+  end
+
+  desc "Update remote rpm repodata on #{@yum_host}"
+  task :remote_update_yum_repo do
+    STDOUT.puts "Really run remote repo update on #{@yum_host}? [y,n]"
+    if ask_yes_or_no
+      remote_ssh_cmd(@yum_host, '/var/lib/gems/1.8/gems/rake-0.9.2.2/bin/rake -f /opt/repository/Rakefile mk_repo')
+    end
+  end
+
+  desc "Ship cow-built debs to #{@apt_host}"
+  task :ship_debs do
+    rsync_to('pkg/deb/', @apt_host, @apt_repo_path)
+  end
+
+  desc "freight RCs to devel repos on #{@apt_host}"
+  task :remote_freight_devel do
+    STDOUT.puts "Really run remote freight RC command on #{@apt_host}? [y,n]"
+    if ask_yes_or_no
+      override = "OVERRIDE=1" if ENV['OVERRIDE']
+      # assume we're building in cows when we ship, since that's what the repo supports
+      # allow OVERRIDE as well for cases where we intend to ship final-style versions to devel repos and vice versa
+      remote_ssh_cmd(@apt_host, "/var/lib/gems/1.8/gems/rake-0.9.2.2/bin/rake -f /opt/repository/Rakefile devel COW=1 #{override}")
+    end
+  end
+
+  desc "remote freight final packages to PRODUCTION repos on #{@apt_host}"
+  task :remote_freight_final do
+    STDOUT.puts "Really run remote freight final command on #{@apt_host}? [y,n]"
+    if ask_yes_or_no
+      override = "OVERRIDE=1" if ENV['OVERRIDE']
+      remote_ssh_cmd(@apt_host, "/var/lib/gems/1.8/gems/rake-0.9.2.2/bin/rake -f /opt/repository/Rakefile community COW=1 #{override}")
+    end
+  end
+
+  desc "Update remote ips repository on #{@ips_host}"
+  task :update_ips_repo do
+    rsync_to('pkg/ips/pkgs', @ips_host, @ips_store)
+    remote_ssh_cmd(@ips_host, "pkgrecv -s #{@ips_store}/pkgs/#{@name}@#{@ipsversion}.p5p -d #{@ips_repo} \\*")
+    remote_ssh_cmd(@ips_host, "pkgrepo refresh -s #{@ips_repo}")
+    remote_ssh_cmd(@ips_host, "/usr/sbin/svcadm restart svc:/application/pkg/server")
+  end if @build_ips
+
+  desc "Ship built gem to rubygems"
+  task :ship_gem do
+    ship_gem("pkg/#{@name}-#{@gemversion}.gem")
+  end if @build_gem
+
+  if File.exist?("#{ENV['HOME']}/.packaging/#{@builder_data_file}")
+    desc "ship apple dmg to #{@yum_host}"
+    task :ship_dmg => ['pl:fetch', 'pl:load_extras'] do
+      rsync_to('pkg/apple/*.dmg', @yum_host, @dmg_path)
+    end if @build_dmg
+
+    desc "ship tarball and signature to #{@yum_host}"
+    task :ship_tar => ['pl:fetch', 'pl:load_extras'] do
+      rsync_to("pkg/#{@name}-#{@version}.tar.gz*", @yum_host, @tarball_path)
+    end
+
+    desc "UBER ship: ship all the things in pkg"
+    task :uber_ship => ['pl:fetch', 'pl:load_extras'] do
+      if confirm_ship(FileList["pkg/**/*"])
+        ENV['ANSWER_OVERRIDE'] = 'yes'
+        Rake::Task["pl:ship_gem"].invoke if @build_gem
+        Rake::Task["pl:ship_rpms"].invoke
+        Rake::Task["pl:ship_debs"].invoke
+        Rake::Task["pl:ship_dmg"].execute if @build_dmg
+        Rake::Task["pl:ship_tar"].execute
+      end
+    end
+  end
+end
+

data/ext/packaging/tasks/sign.rake

@@ -0,0 +1,82 @@
+def sign_el5(rpm)
+  %x{rpm --define '%_gpg_name #{@gpg_name}' --define '%__gpg_sign_cmd %{__gpg} gpg --force-v3-sigs --digest-algo=sha1 --batch --no-verbose --no-armor --passphrase-fd 3 --no-secmem-warning -u %{_gpg_name} -sbo %{__signature_filename} %{__plaintext_filename}' --addsign #{rpm} > /dev/null}
+end
+
+def sign_modern(rpm)
+  %x{rpm --define '%_gpg_name #{@gpg_name}' --addsign #{rpm} > /dev/null}
+end
+
+def rpm_has_sig(rpm)
+  %x{rpm -Kv #{rpm} | grep "#{@gpg_key.downcase}" &> /dev/null}
+  $?.success?
+end
+
+def sign_deb_changes(file)
+  %x{debsign --re-sign -k#{@gpg_key} #{file}}
+end
+
+# requires atleast a self signed prvate key and certificate pair
+def sign_ips(pkg)
+  %x{pkgsign -s pkg/ips/repo/  -k #{@privatekey_pem} -c #{@certificate_pem} #{@name}@#{@ipsversion}}
+  %x{rm -f #{pkg}}
+  %x{pkgrecv -s pkg/ips/repo -a -d #{pkg} #{@name}@#{@ipsversion}}
+end
+
+namespace :pl do
+  desc "Sign the tarball, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
+  task :sign_tar do
+    unless File.exist? "pkg/#{@name}-#{@version}.tar.gz"
+      STDERR.puts "No tarball exists. Try rake package:tar?"
+      exit 1
+    end
+    load_keychain if has_tool('keychain')
+    gpg_sign_file "pkg/#{@name}-#{@version}.tar.gz"
+  end
+
+  desc "Sign mocked rpms, Defaults to PL Key, pass KEY to override"
+  task :sign_rpms do
+    el5_rpms    = Dir["pkg/el/5/**/*.rpm"].join(' ')
+    modern_rpms = (Dir["pkg/el/6/**/*.rpm"] + Dir["pkg/fedora/**/*.rpm"]).join(' ')
+    unless el5_rpms.empty?
+      puts "Signing el5 rpms..."
+      sign_el5(el5_rpms)
+    end
+
+    unless modern_rpms.empty?
+      puts "Signing el6 and fedora rpms..."
+      sign_modern(modern_rpms)
+    end
+  end
+
+  desc "Sign ips package, Defaults to PL Key, pass KEY to override"
+  task :sign_ips do
+    ips_pkgs    = Dir["pkg/ips/pkgs/*.p5p"].join(' ')
+    puts "Signing ips packages..."
+    sign_ips ips_pkgs
+  end if @build_ips
+
+  desc "Check if all rpms are signed"
+  task :check_rpm_sigs do
+    signed = TRUE
+    rpms = Dir["pkg/el/5/**/*.rpm"] + Dir["pkg/el/6/**/*.rpm"] + Dir["pkg/fedora/**/*.rpm"]
+    print 'Checking rpm signatures'
+    rpms.each do |rpm|
+      if rpm_has_sig rpm
+        print '.'
+      else
+        puts "#{rpm} is unsigned."
+        signed = FALSE
+      end
+    end
+    exit 1 unless signed
+    puts "All rpms signed"
+  end
+
+  desc "Sign generated debian changes files. Defaults to PL Key, pass KEY to override"
+  task :sign_deb_changes do
+    load_keychain if has_tool('keychain')
+    sign_deb_changes("pkg/deb/*/*.changes") unless Dir["pkg/deb/*/*.changes"].empty?
+    sign_deb_changes("pkg/deb/*.changes") unless Dir["pkg/deb/*.changes"].empty?
+  end
+end
+

data/ext/packaging/tasks/tag.rake

@@ -0,0 +1,8 @@
+namespace 'pl' do
+  desc "Tag this repository, requires a TAG, e.g. TAG=1.1.1"
+  task "tag" do
+    check_var('TAG', ENV['TAG'])
+    git_tag(ENV['TAG'])
+  end
+end
+

data/ext/packaging/tasks/tar.rake

@@ -0,0 +1,68 @@
+namespace :package do
+  desc "Create a source tar archive"
+  task :tar => [ :clean ] do
+    Rake::Task["package:doc"].invoke if @build_doc
+    tar = ENV['TAR'] || 'tar'
+    workdir = "pkg/#{@name}-#{@version}"
+    mkdir_p(workdir)
+
+    # The list of files to install in the tarball
+    install = FileList.new
+
+    # It is nice to use arrays in YAML to represent array content, but we used
+    # to support a mode where a space-separated string was used.  Support both
+    # to allow a gentle migration to a modern style...
+    patterns =
+      case @files
+      when String
+        STDERR.puts "warning: `files` should be an array, not a string"
+        @files.split(' ')
+
+      when Array
+        @files
+
+      else
+        raise "`files` must be a string or an array!"
+      end
+
+    # We need to add our list of file patterns from the configuration; this
+    # used to be a list of "things to copy recursively", which would install
+    # editor backup files and other nasty things.
+    #
+    # This handles that case correctly, with a deprecation warning, to augment
+    # our FileList with the right things to put in place.
+    #
+    # Eventually, when all our projects are migrated to the new standard, we
+    # can drop this in favour of just pushing the patterns directly into the
+    # FileList and eliminate many lines of code and comment.
+    patterns.each do |pattern|
+      if File.directory?(pattern) and not Dir[pattern + "/**/*"].empty?
+        install.add(pattern + "/**/*")
+      else
+        install.add(pattern)
+      end
+    end
+
+    # Transfer all the files and symlinks into the working directory...
+    install = install.select { |x| File.file?(x) or File.symlink?(x) or empty_dir?(x) }
+
+    install.each do |file|
+      if empty_dir?(file)
+        mkpath(File.join(workdir,file), :verbose => false)
+      else
+        mkpath(File.dirname( File.join(workdir, file) ), :verbose => false)
+        cp_p(file, File.join(workdir, file), :verbose => false)
+      end
+    end
+
+    tar_excludes = @tar_excludes.nil? ? [] : @tar_excludes.split(' ')
+    tar_excludes << "ext/#{@packaging_repo}"
+    Rake::Task["package:template"].invoke(workdir)
+    cd "pkg" do
+      sh "#{tar} --exclude #{tar_excludes.join(" --exclude ")} -zcf #{@name}-#{@version}.tar.gz #{@name}-#{@version}"
+    end
+    rm_rf(workdir)
+    puts
+    puts "Wrote #{`pwd`.strip}/pkg/#{@name}-#{@version}.tar.gz"
+  end
+end

data/ext/packaging/tasks/template.rake

@@ -0,0 +1,13 @@
+# utility task to lay down packaging artifact files from erb templates
+namespace :package do
+  task :template, :workdir do |t, args|
+    workdir = args.workdir
+
+    FileList["#{workdir}/ext/**/*.erb"].each do |template|
+      # process the template, stripping off the ERB extension
+      erb(template, template[0..-5])
+      rm_f(template)
+    end
+  end
+end
+