ood_packaging 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700861e60a7c4cbfcf42804c78d23ba5e99fc4cf143cd0a2e424144ad224cb0b
-  data.tar.gz: 63e75fd5b747215c0bddb937f1680bd884b6c1592808612e67541fd23e4851d6
+  metadata.gz: ff0ba6ed065c5bbebe100c74e3a2c317df604b074467e5c4f60004959131e268
+  data.tar.gz: e4dc858b35504018e10de2c526c93148c1face3396f5ccb77ef73cdb6506c5f3
 SHA512:
-  metadata.gz: d9e1d7516304c4d40648e6ef6c9fafde08c16aa59d1614e6080282206e464fb29b65458becf79012a55e7f79ef664a309e8799cdb0dd4075819554a9fad6f10d
-  data.tar.gz: 806c2875b212f8186d4462422192b95ecca5bc0f9b96c722c8c4df46652186eedced6aeaf3dedce7fbb915614659a640bbe27d3bff8c5ef3d641443bffa5c65a
+  metadata.gz: eb65025fd83bcb216075b111cce2f14f8c7fc5b26b56eb8c0e40233cfad76a18c30998921d07b9fefb0fdc2d3ca0c15d11c0d56f9287a68010656dbe982155e7
+  data.tar.gz: 7da737ae95148ef3cb61dab6ebf96834983a793cb5a07814cf3aa9081b99eda0eca014a22e3a49856ddcb7863523a80e559ba062da059ac29199072123400b44

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

@@ -17,9 +17,13 @@ RUN rm -f /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-
 <% elsif dist =~ /^el/ -%>
 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/*
+<% 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/*
-RUN dnf install -y systemd ruby sudo which wget \
+<% else -%>
+RUN dnf config-manager --set-enabled crb && dnf clean all && rm -rf /var/cache/dnf/*
+<% end -%>
+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/*

data/lib/ood_packaging/build_box/docker-image/RPM-GPG-KEY-ondemand-SHA512

@@ -0,0 +1,64 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+WAS7M0V6x6GPiX+zI1M=
+=wRIy
+-----END PGP PUBLIC KEY BLOCK-----

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

@@ -24,7 +24,11 @@ baseurl=https://yum.osc.edu/ondemand/build/<%= ondemand_repo_version %>/web/el\$
 enabled=1
 gpgcheck=0
 EOF
+<% if scl? -%>
 run rpm --import /build/RPM-GPG-KEY-ondemand
+<% else -%>
+run rpm --import /build/RPM-GPG-KEY-ondemand-SHA512
+<% end -%>
 <% end -%>
 
 header "Creating users"
@@ -72,7 +76,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

@@ -12,6 +12,7 @@ class OodPackaging::BuildBox
   BASE_IMAGES = {
     'el7'          => 'centos:7',
     'el8'          => 'rockylinux/rockylinux:8',
+    'el9'          => 'almalinux:9',
     'ubuntu-20.04' => 'ubuntu:20.04',
     'ubuntu-22.04' => 'ubuntu:22.04'
   }.freeze

data/lib/ood_packaging/package.rb

@@ -31,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'
 
@@ -100,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'])
@@ -119,8 +123,14 @@ class OodPackaging::Package
     !gpg_files.nil?
   end
 
+  def default_gpg_name
+    return 'OnDemand Release Signing Key' if build_box.scl?
+
+    'OnDemand Release Signing Key (SHA512)'
+  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
@@ -184,7 +194,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
@@ -210,13 +220,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!
@@ -234,7 +244,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
 
@@ -248,19 +258,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
 
@@ -271,9 +281,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 = [])
@@ -285,14 +295,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
@@ -306,7 +320,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

@@ -44,8 +44,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/version.rb

@@ -2,15 +2,15 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1'
+      'default'         => '2.1.0'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',
-      'default'         => '1-6'
+      'default'         => '1-7'
     },
     'ondemand-runtime'        => '2.1.1',
     'passenger'               => '6.0.14',
@@ -20,9 +20,9 @@ module OodPackaging
     'ondemand_exporter'       => '0.9.0',
     'ondemand-compute'        => {
       '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1'
+      'default'         => '2.1.0'
     },
-    'python-websockify'       => '0.8.0',
+    'python-websockify'       => '0.10.0',
     'turbovnc'                => '2.2.5'
   }.freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +83,7 @@ files:
 - lib/ood_packaging/build_box.rb
 - lib/ood_packaging/build_box/docker-image/Dockerfile.erb
 - lib/ood_packaging/build_box/docker-image/RPM-GPG-KEY-ondemand
+- lib/ood_packaging/build_box/docker-image/RPM-GPG-KEY-ondemand-SHA512
 - lib/ood_packaging/build_box/docker-image/Rakefile
 - lib/ood_packaging/build_box/docker-image/inituidgid.sh.erb
 - lib/ood_packaging/build_box/docker-image/install.sh.erb