ood_packaging 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27c38bf93bd944bc4a2ea6e3e2e3ec1c847380fd63af529a78fbbf24c227b7d
-  data.tar.gz: de7ef57ce537716a66c0046d6fa27b89097ce11235516c36e8f94421ea3566e3
+  metadata.gz: ae11128e965fd3354104bd152a71bf81df23ae7e9af3a2ab55d28fd3673c0241
+  data.tar.gz: 8eae634358befc26450275963f351861e7d77eae84ad459d8452db260eda67c3
 SHA512:
-  metadata.gz: 2d5d1c157936e25191f5f4ba7a0f852cb110186098f27cb4d9b80ca90247177cbff7731adf8d4e3c5968e97d6753a68c970867529b19cc6a67d51461938e9aa9
-  data.tar.gz: 2015d40a9fc63026c601558592d1369590292280bf8e769651c1dd5cba0525f89fdb9d601ca55788506129feb51dc0ba54d02b423f43ef18f226e449e9ec5e74
+  metadata.gz: 1317e10d1d0e7dd45c5005e0e2346cafa25d2e5158927cae070b6dcd208ab11556c5201927c8a981f3c10536feedaa4b3fb40a3885d1330f279f7b3bbb04b490
+  data.tar.gz: 5dfeeb202a9653c4b338c97e44a53de92f30e7eb723769ca5bd22cfdf4763c27c7414808221cb630d3d49ecb4af474e70fd65fc5d0cae63b516f1fce1c2b9933

data/lib/ood_packaging/build.rb

@@ -146,6 +146,7 @@ class OodPackaging::Build
     rpmbuild! if build_box.rpm?
     debuild! if build_box.deb?
     copy_output!
+    show_output!
     gpg_sign! if build_box.rpm? && gpg_sign?
     sanity!
   end
@@ -165,7 +166,8 @@ class OodPackaging::Build
     bootstrap_gpg! if gpg_sign?
     if podman_runtime?
       puts "\tBootstrap /root".blue
-      sh "cp -r #{ctr_rpmmacros} #{ctr_gpg_dir} /root/"
+      sh "cp -r #{ctr_rpmmacros} /root/"
+      sh "cp -r #{ctr_gpg_dir} /root/" if gpg_sign? && build_box.dnf?
       sh "sed -i 's|/home/ood|/root|g' /root/.rpmmacros"
     end
     puts "\tBootstrap work dir".blue
@@ -218,6 +220,8 @@ class OodPackaging::Build
     Dir.chdir(work_dir) do
       sh "tar -xf #{deb_name}.tar.gz"
     end
+    return unless config.fetch(:update_changelog, true)
+
     puts "\tBootstrap debian build files".blue
     Dir.chdir(deb_work_dir) do
       sh "dh_make -s -y --createorig -f ../#{deb_name}.tar.gz#{cmd_suffix} || true"
@@ -249,7 +253,8 @@ class OodPackaging::Build
     sh "sudo apt update -y#{cmd_suffix}"
     tool = [
       'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
-      '-o APT::Get::Assume-Yes=1 -o Debug::pkgProblemResolver=0 -o APT::Install-Recommends=0'
+      '-o APT::Get::Assume-Yes=1 -o APT::Get::Allow-Downgrades=1',
+      '-o Debug::pkgProblemResolver=0 -o APT::Install-Recommends=0'
     ]
     cmd = [
       'mk-build-deps --install --remove --root-cmd sudo',
@@ -292,6 +297,13 @@ class OodPackaging::Build
     end
   end
 
+  def show_output!
+    puts '== Copied output =='.blue
+    Dir["#{output_dir}/*"].each do |f|
+      puts "\tSaved output #{f}".blue
+    end
+  end
+
   def gpg_sign!
     puts '== GPG sign RPMs =='.blue
     rpms.each do |rpm|

data/lib/ood_packaging/build_box.rb

@@ -92,7 +92,7 @@ class OodPackaging::BuildBox
   end
 
   def image_registry
-    @config[:builx_box_registry] || ENV['OOD_PACKAGING_BUILD_BOX_REGISTRY'] || nil
+    @config[:build_box_registry] || ENV['OOD_PACKAGING_BUILD_BOX_REGISTRY'] || nil
   end
 
   def image_org
@@ -100,7 +100,7 @@ class OodPackaging::BuildBox
   end
 
   def image_name
-    @config[:builx_box_name] || ENV['OOD_PACKAGING_BUILD_BOX_NAME'] || 'ood-buildbox'
+    @config[:build_box_name] || ENV['OOD_PACKAGING_BUILD_BOX_NAME'] || 'ood-buildbox'
   end
 
   def image_version

data/lib/ood_packaging/package.rb

@@ -263,7 +263,7 @@ class OodPackaging::Package
     puts "Build FAILED package=#{package} dist=#{build_box.dist}".red
     raise
   ensure
-    container_exec!(exec_attach, ['-i', '-t']) if attach?
+    container_attach! if attach?
     container_kill! if container_running? && !attach?
   end
 
@@ -302,6 +302,12 @@ class OodPackaging::Package
     raise
   end
 
+  def container_attach!
+    container_exec!(exec_attach, ['-i', '-t']) if attach?
+  ensure
+    container_kill! if container_running?
+  end
+
   def container_kill!
     puts "Killing container #{container_name}".blue
     cmd = [container_runtime, 'kill', container_name]

data/lib/ood_packaging/version.rb

@@ -2,11 +2,11 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1.0'
+      'default'         => '2.1'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake