apt_stage_artifacts 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e81f4aec93257b9ff5c06aa0cf5e29f4b3331f99c76252140b56e2cd12f721b
-  data.tar.gz: db1f53e4c5d5dd0b54ae44bc2ce471e04fbaa89bb520a6a7068262713e34d132
+  metadata.gz: 8e43d6a863a30baa1254fc13176928c876311967637ee2c94aaa525db1d59434
+  data.tar.gz: 04c20925c5ffceac9f3861d0e5783cc3ffec3b30acc992bb7e8384acbcf6fcfa
 SHA512:
-  metadata.gz: 7fb6659180b34b6307ff0ec42d5f0759bc37c62292bb85ba03c6365f5a9c403493dae8370e04fc93ab267dd725cb3f8fb2344db7656ec8cce0fc89d1340dc008
-  data.tar.gz: 4c7042632cfe97bf1cb8716d741b6a7608807157cb47c3faba8792da5dc9acb470f85f27afbfa19d51ad4db65a65163e63ff3d7e237fc9b5ae7688eb72749cb8
+  metadata.gz: f9eab7e0f70f96fa3f960a33c3013f7957e0eb863a7cf381b975e7d1de484ea157ad71635e792dbab50b449c7590bfa996e36959fd98d831f0ebb20795f773e8
+  data.tar.gz: 71c0f29097b376bb4d7e169e48b97d8e2377cc3a7c0267e7dbd21cba360a78e91b42e1e5aa6626c0b5818ca1b44faf17e1db2b2b4c7d62dd83cc6f1fd58912af

data/lib/apt_add_to_freight_library.rb

@@ -77,10 +77,12 @@ class AptAddToFreightLibrary
     logger.info @version_string
     @puppet_version = @user_options['--puppet-version']
     fatal "Invalid Puppet version '#{@puppet_version}'" unless
-      VALID_PUPPET_VERSIONS.include? @puppet_version
+      AptStageArtifacts::VALID_PUPPET_VERSIONS.include? @puppet_version
 
     @repo_type = @user_options['--repo-type']
-    fatal "Invalid repo type '#{@repo_type}'" unless VALID_REPO_TYPES.include? @repo_type
+    unless AptStageArtifacts::VALID_REPO_TYPES.include? @repo_type
+      fatal "Invalid repo type '#{@repo_type}'"
+    end
 
     @codename = @user_options['--codename']
     unless AptStageArtifacts::VALID_CODENAMES.include? @codename
@@ -88,7 +90,7 @@ class AptAddToFreightLibrary
     end
 
     freight_config_file = File.join(
-      FREIGHT_CONFIG_DIRECTORY,
+      AptStageArtifacts::FREIGHT_CONFIG_DIRECTORY,
       "puppet_#{@puppet_version}_#{@repo_type}.conf"
     )
     fatal "Cannot read '#{freight_config_file} on #{`hostname`.chomp}." unless
@@ -110,7 +112,7 @@ class AptAddToFreightLibrary
 
         freight_add_command = %W[
          sudo --user=jenkins --set-home
-         #{FREIGHT_COMMAND} add #{@verbose} --conf="#{freight_config_file}"
+         #{AptStageArtifacts::FREIGHT_COMMAND} add #{@verbose} --conf="#{freight_config_file}"
          #{deb_artifact_path} "apt/#{@codename}"
         ].join(' ')
 

data/lib/apt_stage_artifacts.rb

@@ -16,14 +16,17 @@ class AptStageArtifacts
     Stages .deb artifacts into a freight library from a Vanagon or packaging directory.
 
     Usage:
-        apt-stage-artifacts [--version]
-        apt-stage-artifacts [--version] <top_directory>
+        apt-stage-artifacts [--repo-type=<repo-type>] [<top_directory>]
+        apt-stage-artifacts --version
+        apt-stage-artifacts --help
+
   DOCOPT
 
   def initialize(argv)
     @script_name = File.basename($PROGRAM_NAME)
     @log_level = Logger::INFO
     @user_options = parse_options(argv)
+    @repo_type = @user_options['--repo-type'] || 'stable'
     @version_string = "Version #{AptStageArtifacts::VERSION}"
 
     @artifacts_tarball_name = 'artifacts.tgz'
@@ -44,6 +47,10 @@ class AptStageArtifacts
   def run
     logger.info @version_string
     exit 0 if @user_options['--version']
+    unless AptStageArtifacts::VALID_REPO_TYPES.include? @repo_type
+      fatal "Unknown repo_type: \"#{@repo_type}\". Valid repo types are: " +
+            AptStageArtifacts::VALID_REPO_TYPES.join(', ')
+    end
     load_builder_data_yaml
     collect_artifacts
     create_remote_staging_directory
@@ -114,10 +121,11 @@ class AptStageArtifacts
 
   # A manifest is a staging to-do list represented in JSON as an array of hashes
   # containing:
-  #   deb_file_path:
-  #   codename:
-  #   puppet_version:
-  #   repo_type:
+  #   deb_file_path: relative path to the .deb file
+  #   codename: debian codename for this artifact, needed by freight
+  #   puppet_version: part of the destination apt repo. We maintain apt repos by puppet major
+  #     version
+  #   repo_type: either 'stable' or 'nightly' typically. 'archive' is supported but unused.
   def generate_manifest
     manifest = []
 
@@ -126,15 +134,8 @@ class AptStageArtifacts
 
       repo_name = artifact_components[-2]
       case repo_name
-      when /^puppet(\d+)-nightly$/
-        puppet_version = Regexp.last_match(1)
-        repo_type = 'nightly'
-      when /^puppet(\d+)-archive/
-        puppet_version = Regexp.last_match(1)
-        repo_type = 'archive'
       when /^puppet(\d+)+$/
         puppet_version = Regexp.last_match(1)
-        repo_type = 'stable'
       else
         fatal("Unknown repo name \"#{repo_name}\" in #{deb_file_path}")
       end
@@ -148,7 +149,7 @@ class AptStageArtifacts
         deb_file_path: deb_file_path,
         puppet_version: puppet_version,
         codename: codename,
-        repo_type: repo_type
+        repo_type: @repo_type
       }
     end
 
@@ -161,12 +162,14 @@ class AptStageArtifacts
 
   # Create a tarball that contains the staging manifest and the associated deb files.
   def create_tarball
+    manifest_file_name = AptStageArtifacts::MANIFEST_JSON_FILENAME
+
     tarball_create_command = %W[
       tar --create --gzip --file #{@local_tarball_path} --directory=#{@top_directory}
     ].join(' ')
-    %x(#{tarball_create_command} #{@manifest_file_name} #{@debian_artifacts.join(' ')})
+    %x(#{tarball_create_command} #{manifest_file_name} #{@debian_artifacts.join(' ')})
     unless $CHILD_STATUS.success?
-      fatal "#{tarball_create_command} #{@manifest_file_name} #{@debian_artifacts.join(' ')} failed."
+      fatal "#{tarball_create_command} #{manifest_file_name} #{@debian_artifacts.join(' ')} failed."
     end
 
     logger.info("'#{@local_tarball_path}' created.")

data/lib/apt_stage_from_tarball.rb

@@ -1,4 +1,5 @@
 require 'version'
+require 'mixins/constants'
 require 'mixins/logging'
 
 require 'English'
@@ -86,6 +87,8 @@ class AptStageFromTarball
 
         # Keep a hash, key by puppet_version, of repo_types so that we can
         # efficiently build out the freight caches later.
+        puppet_version = artifact[:puppet_version]
+        repo_type = artifact[:repo_type]
         @repo_types_updated[puppet_version] = [] unless @repo_types_updated.key?(puppet_version)
         @repo_types_updated[puppet_version] |= [repo_type]
       end

data/lib/mixins/constants.rb

@@ -5,6 +5,7 @@
 class AptStageArtifacts
   # Details about freight itself
   FREIGHT_COMMAND = '/usr/bin/freight'
+  FREIGHT_CONFIG_DIRECTORY = '/etc/freight.conf.d'
 
   # Name of the manifest.json file
   MANIFEST_JSON_FILENAME = 'apt_stage_manifest.json'

data/lib/version.rb

@@ -1,3 +1,3 @@
 class AptStageArtifacts
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apt_stage_artifacts
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Puppet Release Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry