packaging 0.99.4 → 0.99.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517f281100a098c92bfdb3b38b538d015d215537
-  data.tar.gz: dabf433d9fc8641f5619a108ccb7de3b574d9961
+  metadata.gz: 88e28e28af482a06291f1f585ede34b6426cb3d3
+  data.tar.gz: 14a563722d00b01bf7237c6395193195f71e8206
 SHA512:
-  metadata.gz: ac5527ee23314f1103309ffe888fa747aa1389c593cdaf4a9624b3ef3089155cd02222b54cf338f26e96ac19c9c011dc67ed837e2352384817d4f805224bfcc6
-  data.tar.gz: bd52d91b00509f4e2feab65e1ff2ce33f6a61843442982066306a3701f03d668f440ea380b0461d537c4205f4fc65579a55b1e60a520d9d58be9f486afd9c2c7
+  metadata.gz: a667b0640aa6361ddb3b7343404102c8461d290ed4f2651fe1b489b85d04a3dc0f5a4d75fa36f6aa186f8cd3191c8d1fdfe306a05d3219e977e40ad3505087f7
+  data.tar.gz: 1fd1370fc99e8bafc3881847bd2f909aa6a1d4f8971c654393f62484bf45b2970dec5ec6e0668bdafb8debb37858efe2f812208c409c6252ac57b7836b00482e

data/lib/packaging/config/params.rb

@@ -76,8 +76,6 @@ module Pkg::Params
                   :gpg_name,
                   :homepage,
                   :internal_gem_host,
-                  :internal_nexus_host,
-                  :internal_stickler_host,
                   :ips_build_host,
                   :ips_host,
                   :ips_inter_cert,
@@ -268,6 +266,7 @@ module Pkg::Params
               { :var => :pe_feature_branch,       :envvar => :PE_FEATURE_BRANCH },
               { :var => :pe_version,              :envvar => :PE_VER },
               { :var => :privatekey_pem,          :envvar => :PRIVATE_PEM },
+              { :var => :project,                 :envvar => :PROJECT_OVERRIDE },
               { :var => :project_root,            :envvar => :PROJECT_ROOT },
               { :var => :random_mockroot,         :envvar => :RANDOM_MOCKROOT, :type => :bool },
               { :var => :rc_mocks,                :envvar => :MOCK },
@@ -292,8 +291,6 @@ module Pkg::Params
               { :var => :yum_repo_path,           :envvar => :YUM_REPO },
               { :var => :yum_staging_server,      :envvar => :YUM_STAGING_SERVER },
               { :var => :internal_gem_host,       :envvar => :INTERNAL_GEM_HOST },
-              { :var => :internal_nexus_host,     :envvar => :INTERNAL_NEXUS_HOST },
-              { :var => :internal_stickler_host,  :envvar => :INTERNAL_STICKLER_HOST },
              ]
   # Default values that are supplied if the user does not supply them
   #
@@ -332,8 +329,6 @@ module Pkg::Params
   # in case it is not set.
   #
   REASSIGNMENTS = [
-                    { :oldvar => :internal_gem_host,      :newvar => :internal_nexus_host },
-                    { :oldvar => :internal_gem_host,      :newvar => :internal_stickler_host },
                     # These are fall-through values for shipping endpoints
                     { :oldvar => :staging_server,         :newvar => :apt_staging_server },
                     { :oldvar => :staging_server,         :newvar => :dmg_staging_server },

data/lib/packaging/gem.rb

@@ -1,91 +1,13 @@
 module Pkg::Gem
-  @nexus_config = "#{ENV['HOME']}/.gem/nexus"
-
   class << self
     # This is preserved because I don't want to update the deprecated code path
     # yet; I'm not entirely sure I've fixed everything that might attempt
     # to call this method so this is now a wrapper for a wrapper.
     def ship(file)
-      ship_to_stickler(file)
-      ship_to_nexus(file)
       rsync_to_downloads(file)
       ship_to_rubygems(file)
     end
 
-    def load_nexus_config
-      if Pkg::Util::File.file_exists?(@nexus_config)
-        config = YAML.load_file(@nexus_config)
-      end
-      config || {}
-    end
-
-    def write_nexus_config
-      hash = load_nexus_config
-      if hash["GEM_INTERNAL"].nil? || hash["GEM_INTERNAL"][:authorization].nil?
-        puts "Please enter nexus username:"
-        username = Pkg::Util.get_input
-        puts "Please enter nexus password:"
-        password = Pkg::Util.get_input(false)
-        hash["GEM_INTERNAL"] = { :authorization => "Basic #{Pkg::Util.base64_encode("#{username}:#{password}")}" }
-      end
-      if hash["GEM_INTERNAL"][:url].nil? || hash["GEM_INTERNAL"][:url] != Pkg::Config.internal_nexus_host
-        hash["GEM_INTERNAL"][:url] = Pkg::Config.internal_nexus_host
-      end
-      File.open(@nexus_config, "w") do |file|
-        file.write(hash.to_yaml)
-      end
-    end
-
-    # Ship a Ruby gem file to a Nexus server, because
-    # you've lost the ability to feel joy anymore.
-    def ship_to_nexus(file)
-      write_nexus_config
-      cmd = "gem nexus #{file} --repo GEM_INTERNAL"
-      if ENV['DRYRUN']
-        puts "[DRY-RUN] #{cmd}"
-      else
-        stdout, _, _ = Pkg::Util::Execution.capture3(cmd, true)
-        # The `gem nexus` command always returns `0` regardless of what the
-        # command results in. In order to properly handle fail cases, this
-        # checks for the success case and fails otherwise. The `ex` command
-        # above will print any output, so the user should have enough info
-        # to debug the failure, and potentially update this fail case if
-        # needed.
-        fail unless stdout.include? "Created"
-        puts "#{file} pushed to nexus server at #{Pkg::Config.internal_nexus_host}"
-      end
-    rescue => e
-      puts "###########################################"
-      puts "#  Nexus failed, ensure the nexus gem is installed,"
-      puts "#  you have access to #{Pkg::Config.internal_nexus_host}"
-      puts "#  and your settings in #{@nexus_config} are correct"
-      puts "###########################################"
-      puts
-      puts e
-      raise e
-    end
-
-    # Ship a Ruby gem file to a Stickler server, because
-    # you've lost the ability to feel joy anymore.
-    def ship_to_stickler(file)
-      Pkg::Util::Tool.check_tool("stickler")
-      cmd = "stickler push #{file} --server=#{Pkg::Config.internal_stickler_host} 2>/dev/null"
-      if ENV['DRYRUN']
-        puts "[DRY-RUN] #{cmd}"
-      else
-        Pkg::Util::Execution.capture3(cmd)
-        puts "#{file} pushed to stickler server at #{Pkg::Config.internal_stickler_host}"
-      end
-    rescue => e
-      puts "###########################################"
-      puts "#  Stickler failed, ensure it's installed"
-      puts "#  and you have access to #{Pkg::Config.internal_stickler_host}"
-      puts "###########################################"
-      puts
-      puts e
-      raise e
-    end
-
     # Use rsync to deploy a file and any associated detached signatures,
     # checksums, or other glob-able artifacts to an external download server.
     def rsync_to_downloads(file)

data/lib/packaging/nuget.rb

@@ -2,7 +2,7 @@ module Pkg::Nuget
   class << self
     def ship(packages)
       #
-      # Support shipping of Nuget style packages to a nexus based nuget feed
+      # Support shipping of Nuget style packages to an Artifactory based nuget feed
       # Using curl to submit the packages rather than windows based choco/mono.
       # This approach gives more flexibility and fits in with the current Puppet
       # release automation practices using linux/mac systems.

data/lib/packaging/retrieve.rb

@@ -55,7 +55,8 @@ module Pkg::Retrieve
     end
     platform_data = Pkg::Util::Serialization.load_yaml(yaml_path)[:platform_data]
     platform_data.each do |platform, paths|
-      default_wget(local_target, "#{build_url}/#{paths[:artifact]}") if Pkg::Config.foss_platforms.include?(platform)
+      path_to_retrieve = File.dirname(paths[:artifact])
+      default_wget(local_target, "#{build_url}/#{path_to_retrieve}/") if Pkg::Config.foss_platforms.include?(platform)
     end
   end
 

data/spec/fixtures/config/ext/build_defaults.yaml

@@ -0,0 +1,2 @@
+---
+:apt_host: foo

data/spec/fixtures/config/ext/project_data.yaml

@@ -0,0 +1,2 @@
+---
+:apt_host: foo

data/tasks/jenkins.rake

@@ -257,6 +257,7 @@ namespace :pl do
         ship_debs
         ship_dmg
         ship_swix
+        ship_tar
         ship_msi
       )
       tasks.map { |t| "pl:#{t}" }.each do |t|

data/tasks/pe_ship.rake

@@ -14,9 +14,9 @@ if Pkg::Config.build_pe
       end
       if Pkg::Config.team == 'release'
 
-        # If this is not a feature branch, we need to link the shipped packages into the feature repos,
-        # then update their metadata as well.
-        unless Pkg::Config.pe_feature_branch
+        # If this is not a feature branch or release branch, we need to link the
+        # shipped packages into the feature repos and update their metadata.
+        unless Pkg::Config.pe_feature_branch || Pkg::Config.pe_release_branch
           puts "Linking RPMs to feature repo"
           Pkg::Util::RakeUtils.invoke_task("pe:remote:link_shipped_rpms_to_feature_repo")
           Pkg::Util::RakeUtils.invoke_task("pe:remote:update_yum_repo")
@@ -126,8 +126,9 @@ if Pkg::Config.build_pe
           files += Dir["pkg/pe/deb/#{dist}/*"].select { |f| f !~ /^.*\.deb$/ }.map { |f| "#{base_path}/#{dist}-source/#{File.basename(f)}" }
         end
       end
-      # If this is not a feature branch, we need to link the shipped packages into the feature repos
-      unless Pkg::Config.pe_feature_branch
+      # If this is not a feature branch or release branch, we need to link the
+      # shipped packages into the feature repos
+      unless Pkg::Config.pe_feature_branch || Pkg::Config.pe_release_branch
         puts "Linking DEBs to feature repo"
         Pkg::Util::RakeUtils.invoke_task("pe:remote:link_shipped_debs_to_feature_repo")
       end

data/tasks/retrieve.rake

@@ -14,6 +14,9 @@ namespace :pl do
   namespace :jenkins do
     desc "Retrieve packages from the distribution server\. Check out commit to retrieve"
     task :retrieve, [:remote_target, :local_target] => 'pl:fetch' do |t, args|
+      unless Pkg::Config.project
+        fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT' environment variable."
+      end
       remote_target = args.remote_target || "artifacts"
       local_target = args.local_target || "pkg"
       mkdir_p local_target
@@ -35,6 +38,9 @@ if Pkg::Config.build_pe
     namespace :jenkins do
       desc "Retrieve packages from the distribution server\. Check out commit to retrieve"
       task :retrieve, [:remote_target, :local_target] => 'pl:fetch' do |t, args|
+        unless Pkg::Config.project
+          fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT' environment variable."
+        end
         remote_target = args.remote_target || "artifacts"
         local_target = args.local_target || "pkg"
         build_url = "http://#{Pkg::Config.builds_server}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{remote_target}"

data/tasks/ship.rake

@@ -309,22 +309,6 @@ namespace :pl do
     unless Pkg::Config.internal_gem_host
       warn 'Value `Pkg::Config.internal_gem_host` not defined; skipping internal ship'
     end
-
-    puts "Do you want to ship #{args[:file]} to the internal stickler server(#{Pkg::Config.internal_stickler_host})?"
-    if Pkg::Util.ask_yes_or_no
-      puts "Shipping gem #{args[:file]} to internal Gem server (#{Pkg::Config.internal_stickler_host})"
-      Pkg::Util::Execution.retry_on_fail(times: 3) do
-        Pkg::Gem.ship_to_stickler(args[:file])
-      end
-    end
-
-    puts "Do you want to ship #{args[:file]} to the internal nexus server(#{Pkg::Config.internal_nexus_host})?"
-    if Pkg::Util.ask_yes_or_no
-      puts "Shipping gem #{args[:file]} to internal Gem server (#{Pkg::Config.internal_nexus_host})"
-      Pkg::Util::Execution.retry_on_fail(times: 3) do
-        Pkg::Gem.ship_to_nexus(args[:file])
-      end
-    end
   end
 
   desc "Ship built gems to public Downloads server (#{Pkg::Config.gem_host})"
@@ -511,22 +495,6 @@ namespace :pl do
     end
 
     if Pkg::Config.build_gem
-      # Do we have stickler and nexus?
-      if Pkg::Util::Misc.check_gem('stickler')
-        `stickler list --server #{Pkg::Config.internal_stickler_host} > /dev/null 2>&1`
-        unless $CHILD_STATUS.zero?
-          errs << "Listing gems at the stickler server #{Pkg::Config.internal_stickler_host} failed!"
-        end
-      else
-        errs << 'gem stickler not found'
-      end
-
-      errs << 'gem nexus not found' unless Pkg::Util::Misc.check_gem('nexus')
-      `gem list --source #{Pkg::Config.internal_nexus_host} > /dev/null 2>&1`
-      unless $CHILD_STATUS.zero?
-        errs << "Listing gems at the nexus server #{Pkg::Config.internal_nexus_host} failed!"
-      end
-
       # Do we have rubygems access set up
       if Pkg::Util::File.file_exists?("#{ENV['HOME']}/.gem/credentials")
         # Do we have permissions to publish this gem on rubygems
@@ -559,6 +527,9 @@ namespace :pl do
     desc 'ship pkg directory contents to artifactory'
     task :ship_to_artifactory, :local_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')
+      unless Pkg::Config.project
+        fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT' environment variable."
+      end
       artifactory = Pkg::ManageArtifactory.new(Pkg::Config.project, Pkg::Config.ref)
 
       local_dir = args.local_dir || 'pkg'
@@ -570,6 +541,9 @@ namespace :pl do
     desc 'Ship pkg directory contents to distribution server'
     task :ship, :target, :local_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')
+      unless Pkg::Config.project
+        fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT' environment variable."
+      end
       target = args.target || 'artifacts'
       local_dir = args.local_dir || 'pkg'
       project_basedir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}"

data/tasks/sign.rake

@@ -162,7 +162,7 @@ namespace :pl do
   end
 
   ##
-  # This crazy piece of work establishes a remote repo on the distribution
+  # This crazy piece of work establishes a remote repo on the signing
   # server, ships our packages out to it, signs them, and brings them back.
   #
   namespace :jenkins do
@@ -212,4 +212,4 @@ DOC
       puts "Signed packages staged in #{$DEFAULT_DIRECTORY}/ directory"
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.4
+  version: 0.99.5
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation

data/spec/fixtures/config/ext/build_defaults.yaml

@@ -1 +0,0 @@
-spec/fixtures/config/ext/../params.yaml

data/spec/fixtures/config/ext/project_data.yaml

@@ -1 +0,0 @@
-spec/fixtures/config/ext/../params.yaml