apt_stage_artifacts 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee106eeb8e60ac6a9d942ded6cd6fed67bc799ec2c77f4740d59a6c4c0667b27
-  data.tar.gz: 1961201b900674777a81a9ec22959873cd5782bc5141b647b89fb893efe20356
+  metadata.gz: e22e83a8811e9598f4dc9fd27b639c743451fdc06e0502092daceb5cea04a9f8
+  data.tar.gz: 9d19f393ac7f403a8dbdd7e56e6888e6392d556a8da28c9b5190eefc0c0a6098
 SHA512:
-  metadata.gz: 988779891f6d6729d1fb70beacdd721b46ffc08a0d0cb5694f5461f3c987b839f87dcdda8fa557050232d85ce539e501759da7440638a2ffc59eac1dc10e35a0
-  data.tar.gz: 04e70a00aaef203277698f49e521ba0daf83c83d7b2f1752a39727e793ab53b1c6c06d25a95f1c4c07ed5c1d620bc599052a32fe311b27cc6ca45d057a6e810e
+  metadata.gz: ae8a11f11b2a4698b684c169d74943770945b9e1f04489c4eaf8a1e3bf28cdfb64d5fdd3629c5febb6eba5f84e4bc5a8e9dd9e3ad1cbab6f659b62eeeabf5a8b
+  data.tar.gz: dcc70849ba88e635c3fbf8d3022f74d0e136fab374f0f06d166208601479858b834765b6833265e7583638f6c0ae0245e8061a96d02ef48a76104896115df1c7

data/lib/apt_stage_artifacts.rb

@@ -86,13 +86,15 @@ class AptStageArtifacts
       exit 1
     end
 
-    logger.info "Searching for .deb packages in #{@top_directory}"
+    logger.info "Searching for puppetN/*.deb packages in #{@top_directory}"
     Dir.chdir(@top_directory) do
-      @debian_artifacts = Dir['**/*.deb']
+      @debian_artifacts = Dir['*/puppet*/*.deb']
     end
     return unless @debian_artifacts.empty?
 
-    logger.error 'No .deb files found. Nothing to do.'
+    logger.warn "This project does not contain artifacts suitable for shipping to the " \
+                "APT server. Expected repo layout is 'pkg/<debian codename>/puppet<N>/*.deb'. " \
+                "Skipping."
     exit 0
   end
 
@@ -137,7 +139,7 @@ class AptStageArtifacts
       when /^puppet(\d+)+$/
         puppet_version = Regexp.last_match(1)
       else
-        fatal("Unknown repo name \"#{repo_name}\" in #{deb_file_path}")
+        fatal "Puppet version not found in \"#{deb_file_path}\"."
       end
 
       codename = deb_file_path.split('/')[-3]
@@ -153,6 +155,10 @@ class AptStageArtifacts
       }
     end
 
+    if manifest.empty?
+      fatal 'No manifest was generated from the artifact list. This is unexpected.'
+    end
+
     manifest_path = File.join(@top_directory, AptStageArtifacts::MANIFEST_JSON_FILENAME)
     File.open(manifest_path, 'w') do |f|
       f.write(manifest.to_json)
@@ -190,7 +196,8 @@ class AptStageArtifacts
 
   # Invoke the remote staging of the sent artifacts
   def invoke_remote_staging
-    %x(ssh #{@staging_server} #{@remote_staging_command} #{@remote_tarball_path})
+    # Do this in a login shell so we get rvm PATH goodness
+    %x(ssh #{@staging_server} '/bin/bash -l -c "#{@remote_staging_command} #{@remote_tarball_path}"')
     return if $CHILD_STATUS.success?
 
     fatal "'ssh #{@staging_server} #{@remote_staging_command} #{@remote_tarball_path}' failed."

data/lib/mixins/constants.rb

@@ -21,7 +21,7 @@ class AptStageArtifacts
 
   # From freight-add:
   # freight-add registers package with one or more manager/distro[/component] pairs (or triples).
-  # component is optional and for apt defaults to 'main'.
+  # component is optional and for apt defaults to 'stable'.
 
   # These are valid APT components. We use 'stable' instead of 'main' established by convention
   # from docker dists (see https://download.docker.com/linux/ubuntu/dists/groovy)

data/lib/version.rb

@@ -1,3 +1,3 @@
 class AptStageArtifacts
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apt_stage_artifacts
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Puppet Release Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.28
 signing_key: 
 specification_version: 4
 summary: Stages .deb artifacts to a remote freight repository