puppet 2.7.22 → 2.7.23

data/ext/packaging/tasks/sign.rake

@@ -32,16 +32,16 @@ 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
-    if File.exist? "pkg/#{@build.project}-#{@build.version}.tar.gz"
-      load_keychain if has_tool('keychain')
-      gpg_sign_file "pkg/#{@build.project}-#{@build.version}.tar.gz"
-    else
-      STDERR.puts "No tarball exists. Try rake package:tar?"
-    end
+    File.exist?("pkg/#{@build.project}-#{@build.version}.tar.gz") or fail "No tarball exists. Try rake package:tar?"
+    load_keychain if has_tool('keychain')
+    gpg_sign_file "pkg/#{@build.project}-#{@build.version}.tar.gz"
   end
 
   desc "Sign mocked rpms, Defaults to PL Key, pass KEY to override"
   task :sign_rpms do
+    # Find x86_64 noarch rpms that have been created as hard links and remove them
+    rm_r Dir["pkg/*/*/*/x86_64/*.noarch.rpm"]
+    # We'll sign the remaining noarch
     el5_rpms    = Dir["pkg/el/5/**/*.rpm"].join(' ')
     modern_rpms = (Dir["pkg/el/6/**/*.rpm"] + Dir["pkg/fedora/**/*.rpm"]).join(' ')
     unless el5_rpms.empty?
@@ -53,6 +53,12 @@ namespace :pl do
       puts "Signing el6 and fedora rpms..."
       sign_modern(modern_rpms)
     end
+    # Now we hardlink them back in
+    Dir["pkg/*/*/*/i386/*.noarch.rpm"].each do |rpm|
+      cd File.dirname(rpm) do
+        ln rpm, File.join("..","x86_64")
+      end
+    end
   end
 
   desc "Sign ips package, Defaults to PL Key, pass KEY to override"
@@ -76,15 +82,19 @@ namespace :pl do
         signed = FALSE
       end
     end
-    exit 1 unless signed
+    fail 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?
+    begin
+      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?
+    ensure
+      %x{keychain -k mine}
+    end
   end
 
   ##
@@ -94,10 +104,8 @@ namespace :pl do
   namespace :jenkins do
     desc "Sign all locally staged packages on #{@build.distribution_server}"
     task :sign_all => "pl:fetch" do
-      if Dir["pkg/*"].empty?
-        warn "There were files found in pkg/. Maybe you wanted to build/retrieve something first?"
-        exit 1
-      end
+      Dir["pkg/*"].empty? and fail "There were files found in pkg/. Maybe you wanted to build/retrieve something first?"
+
       # Because rpms and debs are laid out differently in PE under pkg/ they
       # have a different sign task to address this. Rather than create a whole
       # extra :jenkins task for signing PE, we determine which sign task to use

data/ext/packaging/tasks/tar.rake

@@ -75,7 +75,7 @@ namespace :package do
     ENV['NEW_STYLE_PACKAGE'] and Rake::Task["package:versionbump"].invoke(workdir)
 
     cd "pkg" do
-      sh "#{tar} --exclude #{tar_excludes.join(" --exclude ")} -zcf #{@build.project}-#{@build.version}.tar.gz #{@build.project}-#{@build.version}"
+      sh "#{tar} --exclude #{tar_excludes.join(" --exclude ")} -zcf '#{@build.project}-#{@build.version}.tar.gz' #{@build.project}-#{@build.version}"
     end
     rm_rf(workdir)
     puts

data/ext/packaging/tasks/template.rake

@@ -3,7 +3,7 @@ namespace :package do
   task :template, :workdir do |t, args|
     workdir = args.workdir
 
-    FileList["#{workdir}/ext/**/*.erb"].each do |template|
+    FileList["#{workdir}/ext/**/*.erb"].exclude(/#{workdir}\/ext\/packaging/).each do |template|
       # process the template, stripping off the ERB extension
       erb(template, template[0..-5])
       rm_f(template)

data/ext/packaging/templates/README

@@ -0,0 +1 @@
+Add erb templates to this directory that packaging repo uses

data/ext/packaging/templates/downstream.xml.erb

@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>&lt;p&gt;&#xd;
+When DOWNSTREAM_JOB is passed to the packaging repo, this job is created to wrap the call to that job.&#xd;
+  This allows us to use jenkins&apos; upstream/downstream chaining facilities while retaining the ability to trigger jobs on other jenkins hosts&#xd;
+&lt;/p&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty plugin="hipchat-plugin@0.1.0">
+      <room></room>
+      <startNotification>false</startNotification>
+    </jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+set -e
+# This URI was passed in as an argument to the original rake package call
+curl -i &apos;<%= escape_html(ENV['DOWNSTREAM_JOB']) %>&apos;</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>

data/ext/packaging/templates/packaging.xml.erb

@@ -0,0 +1,182 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+  <actions/>
+  <description>&lt;p&gt;&#xd;
+Dynamically Created Packaging Job for a packaging repo-compatible project.&#xd;
+Intended to be triggered from within a project with the packaging repo&#xd;
+bootstrapped.&#xd;
+&lt;/p&gt;&#xd;
+&lt;p&gt;&#xd;
+Three parameters are expected:&#xd;
+&lt;/p&gt;&#xd;
+1) File: A build parameters file that describes information about the build state&#xd;
+&lt;br&gt;&#xd;
+2) File: A tar.gz of a git bundle, created by the packaging repo, of the&#xd;
+current state of the project to be packaged&#xd;
+&lt;/br&gt;&#xd;
+&lt;br&gt;&#xd;
+3) String: The project, e.g. facter, puppet&#xd;
+&lt;/br&gt;&#xd;
+&lt;p&gt;&#xd;
+This job will be triggered automatically after generation by the packaging&#xd;
+repo.&#xd;
+&lt;/p&gt;&#xd;
+&lt;br&gt;&#xd;
+To trigger another downstream job after completion of this and the downstream repo creation job, pass DOWNSTREAM_JOB=$URI with the invocation, e.g.&#xd;
+&lt;/br&gt;&#xd;
+&lt;p&gt;&#xd;
+pl:jenkins:uber_build DOWNSTREAM_JOB=http://jenkins-release.delivery.puppetlabs.net/job/puppetlabs-packaging-downstream-test/build&#xd;
+&lt;/p&gt;&#xd;
+&lt;p&gt;&#xd;
+To get notified of the failure of this packaging job, pass NOTIFY= with the invocation, e.g.&#xd;
+&lt;/p&gt;&#xd;
+&lt;p&gt;&#xd;
+pl:jenkins:uber_build NOTIFY=foo@puppetlabs.com&#xd;
+&lt;/p&gt;&#xd;
+&lt;p&gt;&#xd;
+  Successful completion of packaging will result in the automatic creation of&#xd;
+  apt/yum repositories on the distribution server with the built packages.  To&#xd;
+  generate client apt/yum repository config files for accessing these packages,&#xd;
+  check out the ref of the git sha that was packaged, and run `rake&#xd;
+  pl:jenkins:(deb|rpm)_repo_configs`. Configuration files will be generated and&#xd;
+  deposited locally in pkg/repo_configs.&#xd;
+&lt;/p&gt;&#xd;
+&#xd;
+&#xd;
+  &#xd;
+</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>3</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jp.ikedam.jenkins.plugins.groovy__label__assignment.GroovyLabelAssignmentProperty plugin="groovy-label-assignment@1.0.0">
+      <groovyScript>def labelMap = [
+        <% @build.cows.split(' ').each do |cow| %>&quot;pl_deb COW=<%= cow %>&quot;: &quot;deb&quot;,<% end %>
+        <% @build.final_mocks.split(' ').each do |mock| %>&quot;pl_mock MOCK=<%= mock %>&quot;: &quot;rpm&quot;,<% end %>
+        &quot;package_tar&quot;: &quot;rpm&quot;,
+        <% if @build.build_gem then %>&quot;package_gem&quot;: &quot;gem&quot;,<% end %>
+        <% if @build.build_dmg then %>&quot;package_apple&quot;: &quot;dmg&quot;,<% end %>
+];
+return labelMap.get(binding.getVariables().get(&quot;command&quot;));</groovyScript>
+    </jp.ikedam.jenkins.plugins.groovy__label__assignment.GroovyLabelAssignmentProperty>
+    <jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty plugin="hipchat-plugin@0.1.0">
+      <room></room>
+      <startNotification>false</startNotification>
+    </jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.FileParameterDefinition>
+          <name>BUILD_PROPERTIES</name>
+          <description></description>
+        </hudson.model.FileParameterDefinition>
+        <hudson.model.FileParameterDefinition>
+          <name>PROJECT_BUNDLE</name>
+          <description></description>
+        </hudson.model.FileParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>PROJECT</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>command</name>
+      <values>
+        <% @build.cows.split(' ').each do |cow| %><string>pl_deb COW=<%= cow %></string><% end %>
+        <% @build.final_mocks.split(' ').each do |mock| %><string>pl_mock MOCK=<%= mock %></string><% end %>
+        <string>package_tar</string>
+        <% if @build.build_gem then %><string>package_gem</string><% end %>
+        <% if @build.build_dmg then %><string>package_apple</string><% end %>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+set -e
+### Create a local clone of the git-bundle that was passed
+# The bundle is wrapped in a tarball. We don't need to know the project that is
+# in the git bundle.
+
+# Swap out _ for : in the command - lein cannot handle : in paths, and jenkins
+# automatically makes directories with the names of the matrix cell (in this
+# case $command) if https://github.com/technomancy/leiningen/issues/891 is ever
+# resolved, this dirty hack can be removed.
+command=$(echo $command | sed 's/_/:/1')
+
+[ -f &quot;PROJECT_BUNDLE&quot; ] || exit 1
+mkdir project &amp;&amp; tar -xzf PROJECT_BUNDLE -C project/
+
+pushd project
+  git clone --recursive $(ls) git_repo
+
+  pushd git_repo
+
+    ### Clone the packaging repo
+    rake package:bootstrap
+
+    ### Perform the build
+    rake $command PARAMS_FILE=&quot;$WORKSPACE/BUILD_PROPERTIES&quot; --trace
+
+    ### Send the results
+    rake pl:jenkins:ship[&quot;artifacts&quot;] PARAMS_FILE=&quot;$WORKSPACE/BUILD_PROPERTIES&quot; --trace
+
+  popd
+popd</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>**/PROJECT_BUNDLE</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>false</allowEmptyArchive>
+    </hudson.tasks.ArtifactArchiver><% if @build.notify %>
+    <hudson.tasks.Mailer plugin="mailer@1.4">
+      <recipients><%= "#{@build.notify}" %></recipients>
+      <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+      <sendToIndividuals>false</sendToIndividuals>
+    </hudson.tasks.Mailer><% end %>
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.16">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
+          </configs>
+          <projects><%= "#{@build.project}-repo-#{@build.build_date}-#{@build.ref}" %></projects>
+          <condition>UNSTABLE_OR_BETTER</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.BuildTrigger>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@1.11">
+      <timeoutMinutes>45</timeoutMinutes>
+      <failBuild>false</failBuild>
+      <writingDescription>false</writingDescription>
+      <timeoutPercentage>0</timeoutPercentage>
+      <timeoutType>absolute</timeoutType>
+      <timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
+    </hudson.plugins.build__timeout.BuildTimeoutWrapper>
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.3.1">
+      <colorMapName>xterm</colorMapName>
+    </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
+  </buildWrappers>
+  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
+    <runSequentially>false</runSequentially>
+  </executionStrategy>
+</matrix-project>

data/ext/packaging/templates/repo.xml.erb

@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>&lt;p&gt;&#xd;
+Dynamically created job to generate apt and yum repos from packages built by jenkins. It uses the git archive from the package:tar cell in the upstream package matrix to determine which repos to create.&#xd;
+&lt;/p&gt;&#xd;
+&lt;p&gt;&#xd;
+This job will trigger the downstream job supplied with DOWNSTREAM_JOB if passed to rake in the upstream invocation.&#xd;
+&lt;/p&gt;&#xd;
+</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>3</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty plugin="hipchat-plugin@0.1.0">
+      <room></room>
+      <startNotification>false</startNotification>
+    </jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>deb||rpm</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.25">
+      <projectName><%= "#{@build.project}-packaging-#{@build.build_date}-#{@build.ref}" %>/command=package_tar</projectName>
+      <filter>**/PROJECT_BUNDLE</filter>
+      <target></target>
+      <selector class="hudson.plugins.copyartifact.TriggeredBuildSelector">
+        <fallbackToLastSuccessful>true</fallbackToLastSuccessful>
+      </selector>
+      <flatten>true</flatten>
+    </hudson.plugins.copyartifact.CopyArtifact>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+set -e
+### We've retrieved the git bundle from the tarball build, so now we clone it
+### and use it to trigger our repo creation
+#
+# PROJECT_BUNDLE is a tarball containing a bundle file and git_repo is the
+# directory that will contain the git repository. First we untar the tarball
+# and then clone the git_bundle
+
+[ -f &quot;PROJECT_BUNDLE&quot; ] || exit 1
+mkdir project &amp;&amp; tar -xzf PROJECT_BUNDLE -C project/
+
+pushd project
+  git clone --recursive $(ls) git_repo
+
+  pushd git_repo
+
+    ### Clone the packaging repo
+    rake package:bootstrap --trace
+
+    ### Run repo creation
+    rake pl:jenkins:rpm_repos --trace
+    rake pl:jenkins:deb_repos --trace
+
+  popd
+popd
+
+# Delete the upstream project now that repos have been created. This is largely
+# to avoid clutter and reclaim space
+#
+curl -i -X POST <%= "http://#{@build.jenkins_build_host}/job/#{@build.project}-packaging-#{@build.build_date}-#{@build.ref}" %>/doDelete
+</command>
+    </hudson.tasks.Shell>
+  </builders><% if ENV['DOWNSTREAM_JOB'] %>
+  <publishers>
+    <hudson.tasks.BuildTrigger>
+      <childProjects><%= "#{@build.project}-downstream-#{@build.build_date}-#{@build.ref}" %></childProjects>
+      <threshold>
+        <name>SUCCESS</name>
+        <ordinal>0</ordinal>
+        <color>BLUE</color>
+      </threshold>
+    </hudson.tasks.BuildTrigger>
+  </publishers><% else %>
+  <publishers/><% end %>
+  <buildWrappers>
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.3.1">
+      <colorMapName>xterm</colorMapName>
+    </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
+  </buildWrappers>
+</project>

data/lib/puppet.rb

@@ -28,6 +28,8 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
+  require 'puppet/file_system'
+
   class << self
     include Puppet::Util
     attr_reader :features

data/lib/puppet/file_system.rb

@@ -0,0 +1,3 @@
+module Puppet::FileSystem
+  require 'puppet/file_system/path_pattern'
+end

data/lib/puppet/file_system/path_pattern.rb

@@ -0,0 +1,97 @@
+require 'pathname'
+
+module Puppet::FileSystem
+  class PathPattern
+    class InvalidPattern < Puppet::Error; end
+
+    TRAVERSAL = /^\.\.$/
+    ABSOLUTE_UNIX = /^\//
+    ABSOLUTE_WINDOWS = /^[a-z]:/i
+    #ABSOLUT_VODKA #notappearinginthisclass
+    CURRENT_DRIVE_RELATIVE_WINDOWS = /^\\/
+
+    def self.relative(pattern)
+      RelativePathPattern.new(pattern)
+    end
+
+    def self.absolute(pattern)
+      AbsolutePathPattern.new(pattern)
+    end
+
+    class << self
+      protected :new
+    end
+
+    # @param prefix [AbsolutePathPattern] An absolute path pattern instance
+    # @return [AbsolutePathPattern] A new AbsolutePathPattern prepended with
+    #   the passed prefix's pattern.
+    def prefix_with(prefix)
+      new_pathname = prefix.pathname + pathname
+      self.class.absolute(new_pathname.to_s)
+    end
+
+    def glob
+      Dir.glob(pathname.to_s)
+    end
+
+    def to_s
+      pathname.to_s
+    end
+
+    protected
+
+    attr_reader :pathname
+
+    private
+
+    def validate
+      @pathname.each_filename do |e|
+        if e =~ TRAVERSAL
+          raise(InvalidPattern, "PathPatterns cannot be created with directory traversals.")
+        end
+      end
+      case @pathname.to_s
+      when CURRENT_DRIVE_RELATIVE_WINDOWS
+        raise(InvalidPattern, "A PathPattern cannot be a Windows current drive relative path.")
+      end
+    end
+
+    def initialize(pattern)
+      begin
+        @pathname = Pathname.new(pattern.strip)
+      rescue ArgumentError => error
+        raise InvalidPattern.new("PathPatterns cannot be created with a zero byte.", error)
+      end
+      validate
+    end
+  end
+
+  class RelativePathPattern < PathPattern
+    def absolute?
+      false
+    end
+
+    def validate
+      super
+      case @pathname.to_s
+      when ABSOLUTE_WINDOWS
+        raise(InvalidPattern, "A relative PathPattern cannot be prefixed with a drive.")
+      when ABSOLUTE_UNIX
+        raise(InvalidPattern, "A relative PathPattern cannot be an absolute path.")
+      end
+    end
+  end
+
+  class AbsolutePathPattern < PathPattern
+    def absolute?
+      true
+    end
+
+    def validate
+      super
+      if @pathname.to_s !~ ABSOLUTE_UNIX and @pathname.to_s !~ ABSOLUTE_WINDOWS
+        raise(InvalidPattern, "An absolute PathPattern cannot be a relative path.")
+      end
+    end
+  end
+end