packaging 0.99.31 → 0.99.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46032268fefeac3b8976ae2cdd44b27bab028dd4154d6dae1b99c62832510e8c
-  data.tar.gz: 56f74df3abe80d40e39caeb2db1c2a4ba025e22ba2e90876191f29cb82a43f33
+  metadata.gz: 38ead6eee53e123cd39afdd4b92313496e9591ea0068de99ccb0567ac40abb62
+  data.tar.gz: ee005f59911683859d7abba2d836bd515e127ef6bedb6b7b5091344efa60d93a
 SHA512:
-  metadata.gz: da7b1a51187cf880d42109e753c9166b5f5147f2f01faf59c880b334ad9abaaacf8ee663a92674b852d2e70133079e649955a925b188df88c256969f49aca972
-  data.tar.gz: 108cfe68681a7c93f1e1b53f6a2a1b620ee5ec5930598c1ab5a01d332ed5460fad9b79fdfb98b082686dbeea3b0442712835783bc6d82384398676084c041536
+  metadata.gz: 57b80b8c7806508eefe557b5445e35ca09a240abcefd2016a0423effdce33cc13f30b719229ac8a4ef2f59db64d4017e88314662f32356c526183dd460fa8f04
+  data.tar.gz: e1069a4a27333f178fa23e0cd8d19e224e9c57345eb4f201b472d8c688e93231692567e587428345525db14477b3471a17c8a9d5c449929f908d5fb6cfaba270

data/lib/packaging/archive.rb

@@ -8,7 +8,7 @@ module Pkg::Archive
 
   # Array of paths for temporarily staging artifacts before syncing to release-archives on s3
   def archive_paths
-    [Pkg::Config.yum_archive_path, Pkg::Config.apt_archive_path, Pkg::Config.freight_archive_path, Pkg::Config.downloads_archive_path].compact.freeze
+    [Pkg::Config.yum_archive_path, Pkg::Config.apt_archive_path, Pkg::Config.freight_archive_path, Pkg::Config.downloads_archive_path, '/opt/tmp-apt'].compact.freeze
   end
 
   # Move yum directories from repo path to archive staging path
@@ -36,46 +36,28 @@ module Pkg::Archive
     Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
   end
 
-  # Move apt directories from repo path (and repo staging path aka freight path) to archive staging paths
+  # Move directories from freight path (aka repo staging path) to archive staging paths
   def stage_apt_archives(directory)
-    # /opt/tools/freight/apt/$codename/#{directory}
-    # /opt/repository/apt/pool/$codename/#{directory}
-    pool_directory = File.join(Pkg::Config.apt_repo_path, 'pool')
+    find_command = "find #{Pkg::Config.apt_repo_staging_path} -type d -name #{directory}"
+    find_command = "find #{Pkg::Config.apt_repo_staging_path} -maxdepth 2 -type f" if directory == 'main'
     command = <<-CMD
-      for full_directory in $(find #{pool_directory} -type d -name #{directory}); do
-        find $full_directory -type l -delete
-        sudo chattr -i -R $full_directory
-        subdirectory=${full_directory##{Pkg::Config.apt_repo_path}/}
-        codename=$(echo $subdirectory | cut -d'/' -f 2)
-        sudo mkdir --parents #{Pkg::Config.apt_archive_path}/$subdirectory
-        sudo chown root:release -R #{Pkg::Config.apt_archive_path}/$subdirectory
-        sudo chmod g+w -R #{Pkg::Config.apt_archive_path}/$subdirectory
-        mv $full_directory #{Pkg::Config.apt_archive_path}/$(dirname $subdirectory)
+      for stuff in $(#{find_command}); do
+        find $stuff -type l -delete
+        codename=$(dirname ${stuff##{Pkg::Config.apt_repo_staging_path}/})
         sudo mkdir --parents #{Pkg::Config.freight_archive_path}/$codename
         sudo chown root:release -R #{Pkg::Config.freight_archive_path}/$codename
         sudo chmod g+w -R #{Pkg::Config.freight_archive_path}/$codename
-        if [ #{directory} = 'main' ]; then
-          freight_directory=#{Pkg::Config.apt_repo_staging_path}/$codename
-          if [ ! -d $freight_directory ]; then
-            echo "ERROR: Couldn't find freight directory $freight_directory, exiting . . ."
-            exit 1
-          fi
-          for file in $(find $freight_directory -maxdepth 1 -type f); do
-            mv $file #{Pkg::Config.freight_archive_path}/$codename
-          done
-        else
-          freight_directory=#{Pkg::Config.apt_repo_staging_path}/$codename/#{directory}
-          if [ ! -d $freight_directory ]; then
-            if [ -d #{Pkg::Config.freight_archive_path}/$codename/#{directory} ]; then
-              echo "Directory $freight_directory has already been staged, skipping . . ."
-              exit 0
-            else
-              echo "ERROR: Couldn't find freight directory $freight_directory, exiting . . ."
-              exit 1
-            fi
-          fi
-          mv $freight_directory #{Pkg::Config.freight_archive_path}/$codename/#{directory}
+        mv $stuff #{Pkg::Config.freight_archive_path}/$codename
+
+        pool_directory=#{Pkg::Config.apt_repo_path}/pool/$codename/#{directory}
+        if [ ! -d $pool_directory ]; then
+          echo "Can't find directory $pool_directory, it may have already been archived, skipping . . ."
+          continue
         fi
+        sudo mkdir --parents /opt/tmp-apt
+        sudo chown root:release -R /opt/tmp-apt
+        sudo chmod g+w -R /opt/tmp-apt
+        mv $pool_directory /opt/tmp-apt
       done
     CMD
     Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)

data/lib/packaging/config/params.rb

@@ -6,6 +6,7 @@ module Pkg::Params
   BUILD_PARAMS = [:allow_dirty_tree,
                   :answer_override,
                   :apt_archive_path,
+                  :apt_archive_repo_command,
                   :apt_host,
                   :apt_releases,
                   :apt_repo_command,
@@ -200,6 +201,7 @@ module Pkg::Params
               { :var => :allow_dirty_tree,        :envvar => :ALLOW_DIRTY_TREE, :type => :bool },
               { :var => :answer_override,         :envvar => :ANSWER_OVERRIDE },
               { :var => :apt_archive_path,        :envvar => :APT_ARCHIVE_PATH },
+              { :var => :apt_archive_repo_command, :envvar => :APT_ARCHIVE_REPO_COMMAND },
               { :var => :apt_host,                :envvar => :APT_HOST },
               { :var => :apt_releases,            :envvar => :APT_RELEASES,    :type => :array },
               { :var => :apt_repo_path,           :envvar => :APT_REPO },

data/spec/lib/packaging/config_spec.rb

@@ -5,6 +5,7 @@ require 'yaml'
 describe "Pkg::Config" do
 
   Build_Params = [:apt_archive_path,
+                  :apt_archive_repo_command,
                   :apt_host,
                   :apt_releases,
                   :apt_repo_path,

data/tasks/archive.rake

@@ -18,6 +18,16 @@ namespace :pl do
       end
     end
 
+    desc "Create archive yum repo"
+    task :update_archive_yum_repo => 'pl:fetch' do
+      Pkg::Repo.update_repo(Pkg::Config.staging_server, Pkg::Config.yum_repo_command, { :repo_name => '', :repo_path => Pkg::Config.yum_archive_path, :repo_host => Pkg::Config.staging_server })
+    end
+
+    desc "Create archive apt repo"
+    task :update_archive_apt_repo => 'pl:fetch' do
+      Pkg::Repo.update_repo(Pkg::Config.staging_server, Pkg::Config.apt_archive_repo_command)
+    end
+
     desc "Sync archived packages to s3"
     task :deploy_staged_archives_to_s3 => 'pl:fetch' do
       command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.31
+  version: 0.99.32
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec