ood_packaging 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d66aca5d9123c4952b9a2842fdc3c63aed8e566bf7f5e9569ce197bccbd3eaf
-  data.tar.gz: bb3382c9d597c60585aa35eb6305005e447e02c558b5a30ccc78bee625291c4a
+  metadata.gz: f77bc1e85f9a6c049c43d9931ce9c8720c9bf8c0fac0b6232a24960e4bcbe388
+  data.tar.gz: 960644b6ecb3e8e73314602590e933bbcfc595ef3588e4be5fed7b486cf80152
 SHA512:
-  metadata.gz: 897f586443e3a39a868d2565dc12320bcd416f45d3fe8f26580024179c7b11ef357a8078e681e738ecfcd19b505cbecdea3dee1bb4c8d593b749bc6e03f578d1
-  data.tar.gz: 3531b9092f90394d950baeeeaa4cf4980eaf6163575953846f75688876c0a00109e4095bf2cc737e4236f3590fd1de2204cd59593e8ac82976512abbb527fb67
+  metadata.gz: 72ace2609fdfda7a9e4b6191925543f293458895847118ce2848d8edf2509d0eec4547032def3d6cc252581e039fe785868e739908ac7280610016048b61a3e3
+  data.tar.gz: 7edac14c5ec2467d4307b0a733a0167b8469fc76688cbed308aec6a7cba07762e2d4eabb29d9ff0af2885aaa2209dad948a908814e0cad0f04436a2c67b1dc29

data/lib/ood_packaging/build.rb

@@ -39,7 +39,10 @@ class OodPackaging::Build
   end
 
   def version
-    ENV['VERSION']
+    ver = ENV['VERSION']
+    return nil if ver == ''
+
+    ver
   end
 
   def rpm_version
@@ -47,6 +50,8 @@ class OodPackaging::Build
   end
 
   def rpm_release
+    return nil if version.nil?
+
     v = version.split('-', 2)
     return '1' if v.size < 2
 
@@ -64,9 +69,10 @@ class OodPackaging::Build
   end
 
   def rpm_defines
-    defines = ["--define 'git_tag #{version}'"]
-    defines.concat ["--define 'package_version #{rpm_version}'"]
-    defines.concat ["--define 'package_release #{rpm_release}'"]
+    defines = []
+    defines.concat ["--define 'git_tag #{version}'"] unless version.nil?
+    defines.concat ["--define 'package_version #{rpm_version}'"] unless rpm_version.nil?
+    defines.concat ["--define 'package_release #{rpm_release}'"] unless rpm_release.nil?
     defines.concat ["--define 'scl #{config[:scl]}'"] if config[:scl]
     defines
   end

data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb

@@ -17,13 +17,15 @@ RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo >> /etc/yum.repos.d/Cent
 RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-scl.repo
 <% elsif dnf? -%>
 RUN dnf update -y && dnf clean all && rm -rf /var/cache/dnf/*
-RUN dnf install -y dnf-utils <%= dist =~ /^el/ ? 'epel-release' : '' %> langpacks-en glibc-all-langpacks && dnf clean all && rm -rf /var/cache/dnf/*
+RUN dnf install -y dnf-utils <%= dist =~ /^el/ ? 'epel-release' : '' %> langpacks-en glibc-langpack-en && dnf clean all && rm -rf /var/cache/dnf/*
 <% if dist == 'el8' -%>
 RUN dnf config-manager --set-enabled powertools && dnf clean all && rm -rf /var/cache/dnf/*
-RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
 <% elsif dist == 'el9' -%>
 RUN dnf config-manager --set-enabled crb && dnf clean all && rm -rf /var/cache/dnf/*
 <% end -%>
+<% if dist =~ /^el/ -%>
+RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
+<% end -%>
 RUN dnf install -y --allowerasing systemd ruby nodejs sudo which wget \
     gcc-c++ gcc make patch shadow-utils gnupg2 \
     rpm-build rpmdevtools rpm-sign <%= dist =~ /^el/ ? 'scl-utils-build' : '' %> && \
@@ -37,8 +39,10 @@ RUN apt update -y && apt install -y apt-transport-https ca-certificates \
     init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
     sudo rake wget curl ruby bundler && \
     apt clean all -y
+<% if arch != 'ppc64le' %>
 RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
+<% end %>
 <% end -%>
 COPY . /build
 RUN /bin/bash /build/install.sh

data/lib/ood_packaging/build_box.rb

@@ -11,7 +11,7 @@ class OodPackaging::BuildBox
 
   BASE_IMAGES = {
     'el7'          => 'centos:7',
-    'el8'          => 'rockylinux/rockylinux:8',
+    'el8'          => 'almalinux:8',
     'el9'          => 'almalinux:9',
     'ubuntu-20.04' => 'ubuntu:20.04',
     'ubuntu-22.04' => 'ubuntu:22.04',
@@ -25,7 +25,8 @@ class OodPackaging::BuildBox
 
   ARCH_PLATFORMS = {
     'x86_64'  => 'linux/amd64',
-    'aarch64' => 'linux/arm64'
+    'aarch64' => 'linux/arm64',
+    'ppc64le' => 'linux/ppc64le'
   }.freeze
 
   def initialize(config = {})

data/lib/ood_packaging/package.rb

@@ -248,7 +248,20 @@ class OodPackaging::Package
     end
   end
 
+  # Unused but left in case useful in future
+  # def handle_signals
+  #   ['QUIT', 'TERM', 'INT'].each do |signal|
+  #     Signal.trap(signal) do
+  #       puts "Caught signal #{signal}, proceeding to kill container".red
+  #       container_kill!
+  #       exit 1
+  #     end
+  #   end
+  # end
+
+  # rubocop:disable Metrics/AbcSize
   def run!
+    # handle_signals
     if tar_only?
       tar!
       return
@@ -259,6 +272,10 @@ class OodPackaging::Package
     container_start!
     container_exec!(exec_rake)
     puts "Build SUCCESS: package=#{package} dist=#{build_box.dist}".green
+  rescue SignalException => e
+    puts "Caught signal #{e}, proceeding to kill container".red
+    container_kill!
+    exit 1
   rescue RuntimeError
     puts "Build FAILED package=#{package} dist=#{build_box.dist}".red
     raise
@@ -266,6 +283,7 @@ class OodPackaging::Package
     container_attach! if attach?
     container_kill! if container_running? && !attach?
   end
+  # rubocop:enable Metrics/AbcSize
 
   def container_running?
     cmd = "#{container_runtime} inspect #{container_name} 2>/dev/null 1>/dev/null"

data/lib/ood_packaging/utils.rb

@@ -63,7 +63,9 @@ module OodPackaging::Utils
   end
 
   def ruby_version
-    '3.0'
+    return '3.0' if dist == 'el7'
+
+    '3.1'
   end
 
   def scl_ruby
@@ -71,7 +73,7 @@ module OodPackaging::Utils
   end
 
   def nodejs_version
-    '14'
+    '18'
   end
 
   def ctr_scripts_dir

data/lib/ood_packaging/version.rb

@@ -2,17 +2,17 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.9.0'
+  VERSION = '0.11.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.1.0',
       'default'         => '3.1'
     },
     'ondemand-release-latest' => {
-      '(ubuntu|debian)' => '1',
+      '(ubuntu|debian)' => '2',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.1.2',
+    'ondemand-runtime'        => '3.1.3',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.17',
     'cjose'                   => '0.6.1',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake