simp-rake-helpers 5.12.3 → 5.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33beb8e656840401f0fb3a07f7aee982fe3931d53b2e233f2e0024398fd03d6c
-  data.tar.gz: 81111ce62e4e8b3ca03a478d765e3944ee8b297af7b2ee1ef5e182e8bacf36f3
+  metadata.gz: d79c389d3f40c038b0ba81fe8351e4f71b256bd1eaeeef52eb0af07239ec793b
+  data.tar.gz: 1025900b3bbfa941429f228c7952bf79ccfec9a0b388a5a8fcfaf670b3c6f590
 SHA512:
-  metadata.gz: 9589c0d228dc77b2e75a641f158ca878c56498566696039c71eca0c414078299c2a7c4951cf48d45e0388b9cb72a1615321381084a11837fbbc42259a65ea880
-  data.tar.gz: 4267702fa365999433e673f26ff0896ad9a088ea7ce7ae26fff38bbc4d9c37b1c6239956bc016644ea8b2aa3b10925989f44fbb178a3d611380eb79db4b5cc6e
+  metadata.gz: 9c2e9f763a211891553cde62a1963f9fd603f1ce9bfed11b828b36206fe5ec73e1b55f7d1f570c5d1df79cdc00c534d57cc8df24cd205e4cabe946895e820d47
+  data.tar.gz: 818c69dcf5bab3bba5516539852abc856973f97275bc186d46ef268c2878d6a4e0542d179a47fd3ed6e48266ff819fc7c70127953694f92b6b7c1b5c03377e98

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 5.12.4 / 2021-10-05
+- Ensure that the DIST qualifier is added to all built RPMs
+- Use the new SimpRepos directory layout when building an ISO using externally
+  copied repos.
+
 ### 5.12.3 / 2021-09-15
 - Handle multiple options for required applications in build:auto
 - Allow users to populate a `reposync` directory in the YUM build space that

data/lib/simp/rake/build/iso.rb

@@ -190,12 +190,19 @@ module Simp::Rake::Build
                 end
               end
 
+              repo_target_dir = dir
+
               # If we've pulled in reposync directories, we expect them to
               # completely overwrite the directory of the same name in the
               # target ISO so no pruning is required
               #
               # Note: CASE MATTERS on the directory names
               if reposync_active
+                # We're working with the new EL8+ layout, so we need to target
+                # the SimpRepos subdirectory
+                repo_target_dir = File.join(dir,'SimpRepos')
+                mkdir_p(repo_target_dir, :verbose => verbose)
+
                 repos_to_overwrite = Dir.glob(File.join(reposync_location, '*'))
                   .delete_if{|x| !File.directory?(x)}
                   .map{|x| File.basename(x)}
@@ -204,13 +211,18 @@ module Simp::Rake::Build
                   src = File.join(reposync_location, repo)
                   target = File.join(dir, repo)
 
-                  rm_rf(target, :verbose => verbose) if File.directory?(target)
-                  cp_r(src, dir, :verbose => verbose)
+                  if File.directory?(target)
+                    rm_rf(target, :verbose => verbose) if File.directory?(target)
+                  else
+                    target = File.join(repo_target_dir, repo)
+                  end
+
+                  cp_r(src, target, :verbose => verbose)
                 end
               else
                 # Prune unwanted packages
                 begin
-                  system("tar --no-same-permissions -C #{dir} -xzf #{tball} *simp_pkglist.txt")
+                  system("tar --no-same-permissions -C #{repo_target_dir} -xzf #{tball} *simp_pkglist.txt")
                 rescue
                   # Does not matter if the command fails
                 end
@@ -235,14 +247,18 @@ module Simp::Rake::Build
                     next if line =~ /^(\s+|#.*)$/
                     exclude_pkgs.push(line.chomp)
                   end
-                  prune_packages(dir,['SIMP'],exclude_pkgs,mkrepo)
+                  prune_packages(dir,['SIMP','SimpRepos'],exclude_pkgs,mkrepo)
                 end
               end
 
               # Add the SIMP code
               system("tar --no-same-permissions -C #{dir} -xzf #{tball}")
 
-              Dir.chdir("#{dir}/SIMP") do
+              # Pop the SIMP directory from the tarball into the correct spot
+              # FIXME: This is a hack
+              FileUtils.mv("#{dir}/SIMP", repo_target_dir) if File.directory?("#{dir}/SIMP")
+
+              Dir.chdir("#{repo_target_dir}/SIMP") do
                 # Add the SIMP Dependencies
                 simp_base_ver = simpver.split('-').first
 
@@ -285,26 +301,40 @@ module Simp::Rake::Build
                   cp(rpm,rpm_arch, :verbose => verbose)
                 end
 
-                ln_s('noarch', arch, :verbose => verbose) if (!File.directory?(arch) && File.directory?('noarch'))
-                fail("Could not find architecture '#{arch}' in the SIMP distribution") unless (File.directory?(arch) || File.symlink?(arch))
+                unless reposync_active
+                  ln_s('noarch', arch, :verbose => verbose) if (!File.directory?(arch) && File.directory?('noarch'))
+                  fail("Could not find architecture '#{arch}' in the SIMP distribution") unless (File.directory?(arch) || File.symlink?(arch))
 
-                # Get everything set up properly...
-                Dir.chdir(arch) do
-                  Dir.glob('../*') do |rpm_dir|
-                    # Don't dive into ourselves
-                    next if File.basename(rpm_dir) == arch
+                  # Get everything set up properly...
+                  Dir.chdir(arch) do
+                    Dir.glob('../*') do |rpm_dir|
+                      # Don't dive into ourselves
+                      next if File.basename(rpm_dir) == arch
 
-                    Dir.glob(%(#{rpm_dir}/*.rpm)) do |source_rpm|
-                      link_target = File.basename(source_rpm)
-                      if File.exist?(source_rpm) && File.exist?(link_target)
-                        next if Pathname.new(source_rpm).realpath == Pathname.new(link_target).realpath
-                      end
+                      Dir.glob(%(#{rpm_dir}/*.rpm)) do |source_rpm|
+                        link_target = File.basename(source_rpm)
+                        if File.exist?(source_rpm) && File.exist?(link_target)
+                          next if Pathname.new(source_rpm).realpath == Pathname.new(link_target).realpath
+                        end
 
-                      ln_sf(source_rpm,link_target, :verbose => verbose)
+                        ln_sf(source_rpm,link_target, :verbose => verbose)
+                      end
                     end
                   end
+                end
+
+                fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+              end
 
-                  fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+              # New ISO Layout
+              if reposync_active
+                Dir.chdir(repo_target_dir) do
+                  gpgkeysdir = File.join('SIMP','GPGKEYS')
+
+                  if File.directory?(gpgkeysdir)
+                    cp_r(gpgkeysdir, '.', :verbose => verbose)
+                    rm_rf(gpgkeysdir, :verbose => verbose)
+                  end
                 end
               end
 

data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec

@@ -301,7 +301,7 @@ end
 
 if req_file then
   for line in req_file:lines() do
-    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: "))
+    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: ") or line:match("^Recommends: "))
 
     if valid_line then
       module_requires = (module_requires .. "\n" .. line)
@@ -319,7 +319,7 @@ Summary:   %{module_name} Puppet Module
 Name:      %{package_name}
 
 Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
+Release:   %{lua: print(package_release)}%{?dist}
 License:   %{lua: print(module_license)}
 Group:     Applications/System
 Source0:   %{package_name}-%{version}-%{release}.tar.gz

data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

@@ -301,7 +301,7 @@ end
 
 if req_file then
   for line in req_file:lines() do
-    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: "))
+    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: ") or line:match("^Recommends: "))
 
     if valid_line then
       module_requires = (module_requires .. "\n" .. line)
@@ -319,7 +319,7 @@ Summary:   %{module_name} Puppet Module
 Name:      %{package_name}
 
 Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
+Release:   %{lua: print(package_release)}%{?dist}
 License:   %{lua: print(module_license)}
 Group:     Applications/System
 Source0:   %{package_name}-%{version}-%{release}.tar.gz

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.12.3'
+  VERSION = '5.12.4'
 end

data/spec/acceptance/suites/default/00_pkg_rpm_custom_scriptlets_spec.rb

@@ -11,7 +11,7 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
     scriptlets = rpm_scriptlets_for(
       host,
       "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      'pupmod-simp-testpackage-0.0.1-1.noarch.rpm'
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
     )
 
     comment '...the expected scriptlet types are present'
@@ -69,7 +69,7 @@ shared_examples_for 'an RPM generator with customized triggers' do
     triggers = rpm_triggers_for(
       host,
       "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      'pupmod-simp-testpackage-0.0.1-1.noarch.rpm'
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
     )
 
 
@@ -107,6 +107,7 @@ describe 'rake pkg:rpm with customized content' do
   hosts.each do |_host|
     context "on #{_host}" do
       let!(:host){ _host }
+      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
 
       it 'can prep the package directories' do
         testpackages = [

data/spec/acceptance/suites/default/10_pkg_rpm_spec.rb

@@ -10,7 +10,7 @@ shared_examples_for 'an RPM generator with edge cases' do
   it 'should use specified release number for the RPM' do
     on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; #{rake_cmd} pkg:rpm")
     release_test_rpm = File.join(pkg_root_dir, 'testpackage_with_release',
-      'dist', 'pupmod-simp-testpackage-0.0.1-42.noarch.rpm')
+      'dist', "pupmod-simp-testpackage-0.0.1-42#{rpm_dist}.noarch.rpm")
     on host, %(test -f #{release_test_rpm})
   end
 
@@ -73,10 +73,10 @@ describe 'rake pkg:rpm' do
     copy_host_files_into_build_user_homedir(hosts)
   end
 
-
   hosts.each do |_host|
     context "on #{_host}" do
       let!(:host){ _host }
+      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
 
       context 'rpm building' do
 
@@ -107,7 +107,7 @@ describe 'rake pkg:rpm' do
         context 'using simpdefault.spec' do
 
           let(:build_type) {:default}
-          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-1.noarch.rpm') }
+          let(:testpackage_rpm) { File.join(testpackage_dir, "dist/pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm") }
 
           it 'should create an RPM' do
             comment "produces RPM on #{host}"

data/spec/acceptance/suites/default/55_build_pkg_signing_spec.rb

@@ -320,7 +320,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
 
     it 'should corrupt the password of new key' do
       key_gen_file = File.join(dev_keydir, 'gengpgkey')
-      on(hosts, "sed -i -e \"s/^Passphrase: /Passphrase: OOPS/\" #{key_gen_file}")
+      on(hosts, "sed -ci -e \"s/^Passphrase: /Passphrase: OOPS/\" #{key_gen_file}")
     end
 
     include_examples('it begins with unsigned RPMs')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.12.3
+  version: 5.12.4
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers