packaging 0.99.0 → 0.99.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60597eac7cb43a07b9c9c5f2e0446eeb97741697
-  data.tar.gz: 4b2493e3dac7fc620c221f29207c1aac0c4628d3
+  metadata.gz: 0ae6398f2a9568e9a9d75426480aa85940ac5df1
+  data.tar.gz: d1e290e42fb8c1604ad1b18d938bb7b7567cd11a
 SHA512:
-  metadata.gz: 945d03dbfe203b4ce43210494fba3da11c365064e54d014d5d2a04f1c42704295a355b0a1bd6a8b1f7b63388b4210db71d8b463b9d388a9ddc1b0d52a6f4bcce
-  data.tar.gz: 0f6e50d73f6d91d9666b49ff6e7a5a8019045c9cfb190a5c0ead9c04d341a5375e95d180bf2560511c404f860a6cedb10a4be4470a9cc717c5a331de61026492
+  metadata.gz: 32df3b1cc9f5f1ec0bc2a41438aa27f2f49bd67d200790d42df368251138eaa90b4d0de76d508e72eb3041beff8dc8aeb5d2e2c4a6f0af157335ac0484a2ccea
+  data.tar.gz: bea38c34983114bd4b445390233da4b0677fb8404e7dd819fec1ba766cb5eeae4bd4e18af68eee0d436671c45953e63db0058e288e84027b335892b009aa2f17

data/lib/packaging/deb/repo.rb

@@ -144,7 +144,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
         return
       end
 
-      invoke_task("pl:fetch")
+      Pkg::Util::RakeUtils.invoke_task("pl:fetch")
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/deb"
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
       Pkg::Util::Execution.retry_on_fail(:times => 3) do

data/lib/packaging/platforms.rb

@@ -291,7 +291,7 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
 
 
     # For platform names with a dash in them, because everything is special
-    supported_arches = arches_for_platform_version(platform, version)
+    supported_arches = arches_for_platform_version(platform, version, true)
     architecture = platform_tag.sub(/^(#{platform}-#{version}|#{codename})-?/, '')
 
     fail unless supported_arches.include?(architecture) || architecture.empty?
@@ -389,9 +389,9 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
   end
 
   # Given a debian codename, return the arches that we build for that codename
-  def arches_for_codename(codename)
+  def arches_for_codename(codename, include_source = false)
     platform, version = codename_to_platform_version(codename)
-    arches_for_platform_version(platform, version)
+    arches_for_platform_version(platform, version, include_source)
   end
 
   # Given a codename, return an array of associated tags
@@ -406,8 +406,19 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
 
   # Given a platform and version, return the arches that we build for that
   # platform
-  def arches_for_platform_version(platform, version)
-    get_attribute_for_platform_version(platform, version, :architectures)
+  def arches_for_platform_version(platform, version, include_source = false)
+    platform_architectures = get_attribute_for_platform_version(platform, version, :architectures)
+    # get_attribute_for_platform_version will raise an exception if the attribute
+    # isn't found. We don't want this to be a fatal error, we just want to append
+    # the source architecture if it's found
+    source_architecture = []
+    if include_source
+      begin
+        source_architecture = Array(get_attribute_for_platform_version(platform, version, :source_architecture))
+      rescue
+      end
+    end
+    return (platform_architectures + source_architecture).flatten
   end
 
   # Returns an array of all currently valid platform tags

data/lib/packaging/rpm/repo.rb

@@ -14,7 +14,7 @@ module Pkg::Rpm::Repo
         return
       end
 
-      invoke_task("pl:fetch")
+      Pkg::Util::RakeUtils.invoke_task("pl:fetch")
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/rpm"
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
       Pkg::Util::Execution.retry_on_fail(:times => 3) do

data/lib/packaging/util/net.rb

@@ -351,7 +351,7 @@ module Pkg::Util::Net
       tarball_name = File.basename(tarball).gsub('.tar.gz', '')
       Pkg::Util::Net.rsync_to(tarball, host, '/tmp')
       appendix = Pkg::Util.rand_string
-      Pkg::Util::Net.remote_ssh_cmd(host, "#{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ; git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ; cd /tmp/#{Pkg::Config.project}-#{appendix} ; rake package:bootstrap")
+      Pkg::Util::Net.remote_ssh_cmd(host, "#{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ; git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ; cd /tmp/#{Pkg::Config.project}-#{appendix} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake package:bootstrap")
       "/tmp/#{Pkg::Config.project}-#{appendix}"
     end
 

data/spec/lib/packaging/deb/repo_spec.rb

@@ -114,7 +114,7 @@ describe "Pkg::Deb::Repo" do
       Pkg::Config.distribution_server = "a.host.that.wont.exist"
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/repo_configs/deb"
       Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/deb").and_return(false)
-      Pkg::Deb::Repo.should_receive(:invoke_task).with("pl:fetch")
+      Pkg::Util::RakeUtils.should_receive(:invoke_task).with("pl:fetch")
       Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
       Pkg::Util::Execution.should_receive(:retry_on_fail).with(:times => 3)
       Pkg::Deb::Repo.ship_repo_configs

data/spec/lib/packaging/platforms_spec.rb

@@ -61,6 +61,10 @@ describe 'Pkg::Platforms' do
     it 'should return an array of arches corresponding to a given codename' do
       expect(Pkg::Platforms.arches_for_codename('trusty')).to match_array(['i386', 'amd64'])
     end
+
+    it 'should be able to include source archietectures' do
+      expect(Pkg::Platforms.arches_for_codename('trusty', true)).to match_array(['i386', 'amd64', 'source'])
+    end
   end
 
   describe '#codename_to_tags' do
@@ -73,6 +77,10 @@ describe 'Pkg::Platforms' do
     it 'should return an array of arches for a given platform and version' do
       expect(Pkg::Platforms.arches_for_platform_version('sles', '11')).to match_array(['i386', 'x86_64', 's390x'])
     end
+
+    it 'should be able to include source architectures' do
+      expect(Pkg::Platforms.arches_for_platform_version('sles', '11', true)).to match_array(['i386', 'x86_64', 's390x', 'SRPMS'])
+    end
   end
 
   describe '#platform_tags' do
@@ -127,6 +135,8 @@ describe 'Pkg::Platforms' do
       'xenial' => ['ubuntu', '16.04', ''],
       'windows-2012' => ['windows', '2012', ''],
       'redhat-fips-7-x86_64' => ['redhat-fips', '7', 'x86_64'],
+      'el-7-SRPMS' => ['el', '7', 'SRPMS'],
+      'ubuntu-14.04-source' => ['ubuntu', '14.04', 'source'],
     }
 
     fail_cases = [
@@ -136,6 +146,8 @@ describe 'Pkg::Platforms' do
       'windows-x86',
       'el-7-notarch',
       'debian-7-x86_64',
+      'el-7-source',
+      'debian-7-SRPMS',
     ]
 
     test_cases.each do |platform_tag, results|

data/spec/lib/packaging/rpm/repo_spec.rb

@@ -124,7 +124,7 @@ describe "Pkg::Rpm::Repo" do
       Pkg::Config.distribution_server = "a.host.that.wont.exist"
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/repo_configs/rpm"
       Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/rpm").and_return(false)
-      Pkg::Rpm::Repo.should_receive(:invoke_task).with("pl:fetch")
+      Pkg::Util::RakeUtils.should_receive(:invoke_task).with("pl:fetch")
       Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
       Pkg::Util::Execution.should_receive(:retry_on_fail).with(:times => 3)
       Pkg::Rpm::Repo.ship_repo_configs

data/tasks/nightly_repos.rake

@@ -21,7 +21,7 @@ namespace :pl do
       remote_repo   = Pkg::Util::Net.remote_bootstrap(signing_server, 'HEAD', nil, signing_bundle)
       build_params  = Pkg::Util::Net.remote_buildparams(signing_server, Pkg::Config)
       Pkg::Util::Net.rsync_to('repos', signing_server, remote_repo)
-      Pkg::Util::Net.remote_ssh_cmd(signing_server, "cd #{remote_repo} ; rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}")
+      Pkg::Util::Net.remote_ssh_cmd(signing_server, "cd #{remote_repo} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}")
       Pkg::Util::Net.rsync_from("#{remote_repo}/repos/", signing_server, target)
       Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm -rf #{remote_repo}")
       Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm #{build_params}")

data/tasks/sign.rake

@@ -216,7 +216,7 @@ namespace :pl do
       remote_repo   = Pkg::Util::Net.remote_bootstrap(Pkg::Config.signing_server, 'HEAD', nil, signing_bundle)
       build_params  = Pkg::Util::Net.remote_buildparams(Pkg::Config.signing_server, Pkg::Config)
       Pkg::Util::Net.rsync_to('pkg', Pkg::Config.signing_server, remote_repo)
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "cd #{remote_repo} ; rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}")
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "cd #{remote_repo} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}")
       Pkg::Util::Net.rsync_from("#{remote_repo}/pkg/", Pkg::Config.signing_server, "pkg/")
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm -rf #{remote_repo}")
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm #{build_params}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.0
+  version: 0.99.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.2.1
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,8 @@ files:
 - templates/packaging.xml.erb
 - templates/repo.xml.erb
 homepage: http://github.com/puppetlabs/packaging
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="