ood_packaging 0.0.1.rc.8 → 0.0.2.r2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35313ff05abd30a1fe0a89b1b3ea039b243b8dd79fff3abf2fd10b5e4303da34
-  data.tar.gz: f53282cdb17c0f842b670d0880bec8fa835256e2b4a5d7360c9b4e735a8d28e5
+  metadata.gz: 9a6b3566973d14a67793306517648074a14a90e485adb9e16c150477f0622875
+  data.tar.gz: 1b24618f2a5ae46c8a39e759e2cae1ae9b06f439f774de56dbd084832331b1b8
 SHA512:
-  metadata.gz: 610ae49708662da55f861cfc24ebc27859be6a633521fe12c6d5ab531f36346c06267af0a179be729c47cb0e6cc1047eb5cc80fe78dba9bf6935528d4ad976fe
-  data.tar.gz: 6127553b6a531b8b9febc6a14c8eaacf1c6c720859b81a7df7361f278a369c395c26d6057ff05aa2bb1ef51519bf2a6aea55c47affd67740dcbffc4ac667d65b
+  metadata.gz: 1be5dc8f3a13ffc3eeeb496ed6b700ac92a78b8d84861225a01f3343b11ba6387b389794af9ceda44b7ea80b22dc364c21780d8578a1d770984165028ca4c25f
+  data.tar.gz: 47a5e5315cd46df79c3500b8c5f118217ad25303a5189c2b0b4be6de71691db00d7369766b20c95bbc12eaa35c09fb4c6d47c671252372098afa770fd5d345fa

data/bin/ood_packaging

@@ -2,13 +2,9 @@
 # frozen_string_literal: true
 
 require 'optparse'
-begin
-  require 'ood_packaging'
-# If gem is not installed, load from location in git repo
-rescue LoadError
-  $LOAD_PATH.unshift(File.expand_path(File.join(__dir__, '../lib')))
-  require 'ood_packaging'
-end
+libdir = File.expand_path(File.join(__dir__, '../lib'))
+$LOAD_PATH.unshift(libdir) if Dir.exist?(libdir)
+require 'ood_packaging'
 
 options = {}
 OptionParser.new do |opts|

data/lib/ood_packaging/build.rb

@@ -94,6 +94,8 @@ class OodPackaging::Build
   def debian_dir
     @debian_dir ||= if Dir.exist?('/package/deb/debian')
                       '/package/deb/debian'
+                    elsif Dir.exist?('/package/packaging/deb')
+                      '/package/packaging/deb'
                     else
                       '/package/debian'
                     end
@@ -144,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
@@ -219,7 +222,7 @@ class OodPackaging::Build
     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"
-      sh "dch -b -v #{deb_version} 'Release #{deb_version}'#{cmd_suffix}"
+      sh "dch -b -v #{deb_version} --controlmaint 'Release #{deb_version}'#{cmd_suffix}"
     end
   end
 
@@ -245,9 +248,14 @@ class OodPackaging::Build
 
   def install_deb_dependencies!
     sh "sudo apt update -y#{cmd_suffix}"
+    tool = [
+      'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
+      '-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',
-      "--tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes'"
+      "--tool='#{tool.join(' ')}'"
     ]
     Dir.chdir(deb_work_dir) do
       sh "#{cmd.join(' ')}#{cmd_suffix}"
@@ -286,6 +294,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/docker-image/Dockerfile.erb

@@ -2,32 +2,35 @@ FROM <%= base_image %>
 MAINTAINER Trey Dockendorf <tdockendorf@osc.edu>
 ENV LANG=en_US.UTF-8
 ENV LC_CTYPE=en_US.UTF-8
+ENV USER=<%= ctr_user %>
 ENV GEM_PATH=<%= ctr_gems_dir %>:
-<% if dist == 'el7' -%>
+<% if scl? -%>
 RUN yum update -y && yum clean all && rm -rf /var/cache/yum/*
 RUN yum install -y yum-utils epel-release centos-release-scl && yum clean all && rm -rf /var/cache/yum/*
 RUN yum install -y <%= scl_ruby %>-ruby sudo which wget @buildsys-build \
     rpm-build rpmdevtools rpm-sign scl-utils-build && \
     yum clean all && rm -rf /var/cache/yum/*
-<% elsif dist =~ /^el/ -%>
+RUN rm -f /etc/yum.repos.d/CentOS-Vault.repo /etc/yum.repos.d/CentOS-Sources.repo
+RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl.repo > /etc/yum.repos.d/CentOS-SCLo.repo
+RUN head -n 13 /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo >> /etc/yum.repos.d/CentOS-SCLo.repo
+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 epel-release langpacks-en glibc-all-langpacks && dnf clean all && rm -rf /var/cache/dnf/*
 RUN dnf config-manager --set-enabled powertools && dnf clean all && rm -rf /var/cache/dnf/*
-RUN dnf module enable -y ruby:<%= ruby_version %> && dnf clean all && rm -rf /var/cache/dnf/*
-RUN dnf module enable -y nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
-RUN dnf install -y ruby sudo which wget \
+RUN dnf module enable -y ruby:<%= ruby_version %> nodejs:<%= nodejs_version %> && dnf clean all && rm -rf /var/cache/dnf/*
+RUN dnf install -y systemd ruby nodejs sudo which wget \
     gcc-c++ gcc make patch \
     rpm-build rpmdevtools rpm-sign scl-utils-build && \
     dnf clean all && rm -rf /var/cache/dnf/*
-<% elsif dist =~ /^ubuntu|debian/ -%>
+<% elsif deb? -%>
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update -y && apt upgrade -y && apt clean all -y
 RUN apt update -y && apt install -y locales && locale-gen $LANG && \
     apt clean all -y
 RUN apt update -y && apt install -y apt-transport-https ca-certificates \
-    init debhelper devscripts dh-make build-essential lintian equivs \
-    sudo rake wget curl ruby && \
-    ln -snf /bin/bundle2.7 /bin/bundle && \
+    init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
+    sudo rake wget curl ruby bundler && \
     apt clean all -y
 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

data/lib/ood_packaging/build_box/docker-image/install.sh.erb

@@ -72,7 +72,7 @@ echo "allow-loopback-pinentry" >> <%= ctr_gpg_dir %>/gpg-agent.conf
 <%- end -%>
 
 header "Install ood_packaging gem"
-<%- if rpm? && !dnf? -%>
+<%- if scl? -%>
 run scl enable <%= scl_ruby %> -- gem install --no-doc --bindir <%= ctr_scripts_dir %> --install-dir <%= ctr_gems_dir %> /build/*.gem
 <%- else -%>
 run gem install --no-doc --bindir <%= ctr_scripts_dir %> --install-dir <%= ctr_gems_dir %> /build/*.gem

data/lib/ood_packaging/build_box.rb

@@ -133,6 +133,10 @@ class OodPackaging::BuildBox
     sh [container_runtime, 'push', image_tag].join(' ')
   end
 
+  def pull!
+    sh [container_runtime, 'pull', image_tag].join(' ')
+  end
+
   def save!(path)
     sh [container_runtime, 'save', image_tag, '| gzip >', path].join(' ')
   end

data/lib/ood_packaging/package.rb

@@ -21,8 +21,6 @@ class OodPackaging::Package
     @config = config
     @config[:dist] = 'el8' if tar_only?
     @build_box = OodPackaging::BuildBox.new(config)
-    @clean_work_dir = config[:clean_work_dir].nil? ? true : config[:clean_work_dir]
-    @clean_output_dir = config[:clean_output_dir].nil? ? true : config[:clean_output_dir]
     raise ArgumentError, 'Package is required' if package.nil?
     raise ArgumentError, 'Version is required' if version.nil?
     raise ArgumentError, "Package #{package} is not a directory" unless Dir.exist?(package)
@@ -33,12 +31,18 @@ class OodPackaging::Package
     @container_name ||= SecureRandom.uuid
   end
 
-  def debug
+  def debug?
     return true if ENV['OOD_PACKAGING_DEBUG'] == 'true'
 
     @config[:debug].nil? ? false : @config[:debug]
   end
 
+  def cmd_suffix
+    return '' if debug?
+
+    ' 2>/dev/null 1>/dev/null'
+  end
+
   def attach?
     return true if ENV['OOD_PACKAGING_ATTACH'] == 'true'
 
@@ -49,10 +53,22 @@ class OodPackaging::Package
     @work_dir ||= File.expand_path(@config[:work_dir])
   end
 
+  def clean_work_dir
+    return false if ENV['OOD_PACKAGING_CLEAN_WORK_DIR'] == 'false'
+
+    @config[:clean_work_dir].nil? ? true : @config[:clean_work_dir]
+  end
+
   def output_dir
     @output_dir ||= File.expand_path(@config[:output_dir])
   end
 
+  def clean_output_dir
+    return false if ENV['OOD_PACKAGING_CLEAN_OUTPUT_DIR'] == 'false'
+
+    @config[:clean_output_dir].nil? ? true : @config[:clean_output_dir]
+  end
+
   def package
     @config[:package]
   end
@@ -90,8 +106,6 @@ class OodPackaging::Package
 
   def gpg_files
     [
-      OpenStruct.new(private_key: File.join(proj_root, 'ondemand.sec'), passphrase: File.join(proj_root, '.gpgpass')),
-      OpenStruct.new(private_key: File.join(package, 'ondemand.sec'), passphrase: File.join(package, '.gpgpass')),
       OpenStruct.new(private_key: @config[:gpg_private_key], passphrase: @config[:gpg_passphrase]),
       OpenStruct.new(private_key: ENV['OOD_PACKAGING_GPG_PRIVATE_KEY'],
                      passphrase:  ENV['OOD_PACKAGING_GPG_PASSPHRASE'])
@@ -109,8 +123,12 @@ class OodPackaging::Package
     !gpg_files.nil?
   end
 
+  def default_gpg_name
+    'OnDemand Release Signing Key'
+  end
+
   def gpg_name
-    @config[:gpg_name].nil? ? 'OnDemand Release Signing Key' : @config[:gpg_name]
+    @config[:gpg_name].nil? ? default_gpg_name : @config[:gpg_name]
   end
 
   def container_init
@@ -174,7 +192,7 @@ class OodPackaging::Package
     cmd.concat exec_launchers if docker_runtime?
     cmd.concat ['scl', 'enable', scl_ruby, '--'] if podman_runtime? && build_box.scl?
     cmd.concat [File.join(ctr_scripts_dir, 'rake')]
-    cmd.concat ['-q'] unless debug
+    cmd.concat ['-q'] unless debug?
     cmd.concat ['-f', File.join(ctr_scripts_dir, 'Rakefile'), 'ood_packaging:package:build']
     cmd
   end
@@ -200,13 +218,13 @@ class OodPackaging::Package
   end
 
   def clean!
-    sh "rm -rf #{work_dir}", verbose: debug if @clean_work_dir
-    sh "rm -rf #{output_dir}", verbose: debug if @clean_output_dir
+    sh "rm -rf #{work_dir}", verbose: debug? if clean_work_dir
+    sh "rm -rf #{output_dir}", verbose: debug? if clean_output_dir
   end
 
   def bootstrap!
-    sh "mkdir -p #{work_dir}", verbose: debug
-    sh "mkdir -p #{output_dir}", verbose: debug
+    sh "mkdir -p #{work_dir}", verbose: debug?
+    sh "mkdir -p #{output_dir}", verbose: debug?
   end
 
   def tar!
@@ -224,7 +242,7 @@ class OodPackaging::Package
     sh "rm #{tar_file}" if File.exist?(tar_file)
     puts "Create tar archive #{tar_file}".blue
     Dir.chdir(tar_path) do
-      sh cmd.join(' '), verbose: debug
+      sh cmd.join(' '), verbose: debug?
     end
   end
 
@@ -238,19 +256,19 @@ class OodPackaging::Package
     tar! if tar?
     container_start!
     container_exec!(exec_rake)
+    puts "Build SUCCESS: package=#{package} dist=#{build_box.dist}".green
   rescue RuntimeError
-    # ret = 1
     puts "Build FAILED package=#{package} dist=#{build_box.dist}".red
     raise
-  else
-    puts "Build SUCCESS: package=#{package} dist=#{build_box.dist}".green
   ensure
     container_exec!(exec_attach, ['-i', '-t']) if attach?
-    container_kill! if container_running?
+    container_kill! if container_running? && !attach?
   end
 
   def container_running?
-    `#{container_runtime} inspect #{container_name} 2>/dev/null 1>/dev/null`
+    cmd = "#{container_runtime} inspect #{container_name} 2>/dev/null 1>/dev/null"
+    puts cmd if debug?
+    `#{cmd}`
     $CHILD_STATUS.success?
   end
 
@@ -261,9 +279,9 @@ class OodPackaging::Package
     cmd.concat container_mounts
     cmd.concat [build_box.image_tag]
     cmd.concat [container_init]
-    cmd.concat ['1>/dev/null'] unless debug
+    cmd.concat ['1>/dev/null'] unless debug?
     puts "Starting container #{container_name} using image #{build_box.image_tag}".blue
-    sh cmd.join(' '), verbose: debug
+    sh cmd.join(' '), verbose: debug?
   end
 
   def container_exec!(exec_cmd, extra_args = [])
@@ -275,14 +293,18 @@ class OodPackaging::Package
     cmd.concat [container_name]
     cmd.concat exec_cmd
     puts "Build STARTED: package=#{package} dist=#{build_box.dist} exec=#{exec_cmd[-1]}".blue
-    sh cmd.join(' '), verbose: debug
+    sh cmd.join(' '), verbose: debug?
+    true
+  rescue RuntimeError
+    container_kill! if container_running? && !attach?
+    raise
   end
 
   def container_kill!
     puts "Killing container #{container_name}".blue
     cmd = [container_runtime, 'kill', container_name]
-    cmd.concat ['1>/dev/null', '2>/dev/null'] unless debug
-    sh cmd.join(' '), verbose: debug
+    cmd.concat [cmd_suffix] unless debug?
+    sh cmd.join(' '), verbose: debug?
   end
 
   def container_env
@@ -296,7 +318,7 @@ class OodPackaging::Package
       'SKIP_DOWNLOAD' => @config[:skip_download],
       'OOD_UID'       => Process.uid,
       'OOD_GID'       => Process.gid,
-      'DEBUG'         => debug
+      'DEBUG'         => debug?
     }
     env['GPG_PUBKEY'] = '/gpg.pub' if @config[:gpg_pubkey]
     env

data/lib/ood_packaging/tasks.rb

@@ -28,6 +28,12 @@ namespace :ood_packaging do
       @build_box.push!
     end
 
+    desc 'Pull buildbox image'
+    task :pull, [:dist] do |_task, args|
+      @build_box = OodPackaging::BuildBox.new(args)
+      @build_box.pull!
+    end
+
     desc 'Save buildbox image'
     task :save, [:dist, :path] do |_task, args|
       @build_box = OodPackaging::BuildBox.new(args)
@@ -44,8 +50,9 @@ namespace :ood_packaging do
     OodPackaging::RakeTask.new(:internal, [:package, :dist]) do |t, args|
       name = args[:package].split(':').last
       t.package = File.join(proj_root, 'packages', name)
-      t.dist = args[:dist] || ENV['OOD_PACKAGING_DIST']
-      t.version = OodPackaging.package_version(name, args[:dist])
+      dist = args[:dist] || ENV['OOD_PACKAGING_DIST']
+      t.dist = dist
+      t.version = OodPackaging.package_version(name, dist)
       t.work_dir = File.join(proj_root, 'tmp/work')
       t.output_dir = File.join(proj_root, 'tmp/output')
     end

data/lib/ood_packaging/utils.rb

@@ -55,7 +55,7 @@ module OodPackaging::Utils
   end
 
   def ondemand_repo_version
-    '2.1'
+    '2.0'
   end
 
   def ruby_version
@@ -67,7 +67,7 @@ module OodPackaging::Utils
   end
 
   def nodejs_version
-    '14'
+    '12'
   end
 
   def ctr_scripts_dir

data/lib/ood_packaging/version.rb

@@ -2,25 +2,25 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.0.1.rc.8'
+  VERSION = '0.0.2.r2.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
-      '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1'
+      '(ubuntu|debian)' => '2.0.0',
+      'default'         => '2.0'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',
-      'default'         => '1-6'
+      'default'         => '1-7'
     },
-    'ondemand-runtime'        => '2.1',
-    'passenger'               => '6.0.11',
+    'ondemand-runtime'        => '2.0-2',
+    'passenger'               => '6.0.14',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.5',
     'sqlite'                  => '3.26.0-4',
     'ondemand_exporter'       => '0.9.0',
     'ondemand-compute'        => {
-      '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1'
+      '(ubuntu|debian)' => '2.0',
+      'default'         => '2.0'
     },
     'python-websockify'       => '0.8.0',
     'turbovnc'                => '2.2.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc.8
+  version: 0.0.2.r2.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Open OnDemand packaging library