ood_packaging 0.13.5 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 120ebc4d1949712aacdba2bd921b88b7e7f1989cb7c331884b846ca8e0463436
-  data.tar.gz: 8aa0b043a9585fd9172079cc53110cfd388944a3b91483b82a8c09f89a24ae4d
+  metadata.gz: 656a6401eaec78f65b1bec9ccc11502148d63f04417bc43e48e0f83dfdf58273
+  data.tar.gz: 25e4b94d9685147d3546f60583a68b1f62b5c2d3c8bc7eb777e96a69b7afb971
 SHA512:
-  metadata.gz: 2565be7636661510858406eda2f508abc0d7c1a8393ffc0b7ba2901684dd92564fd6c6e04290d8cd1b72225e0ca7db0cc9b9562b71590eb5006713e27bef86be
-  data.tar.gz: 88e2445c6008856b008c35eb75a726a1605cbd3813dcb2b27ad46e1f686c6dc87edc07b9ecb6aa1d9d2e50176d590752ffe87cdf9933ce9c35f59c0818440b98
+  metadata.gz: a17c41c9ebbbd484a65598a4d4f3b4bfbe141bfc28664909d40504f953d03274d703a6e0398c29041708bf87af4eeff5fc115136ef348997286047c6512c3bea
+  data.tar.gz: 41b909a3468dbfc89774eff24186b1e27edb094cc2e3a7189c3ec12f7a0b078c9beb6d96911e5fd8347cd00c6f74d2c60f23ca317ced88c75b8e5dd0fb53ed81

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

@@ -7,17 +7,7 @@ ENV LC_CTYPE=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
 ENV USER=<%= ctr_user %>
 ENV GEM_PATH=<%= ctr_gems_dir %>:
-<% if dist == 'el7' -%>
-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/*
-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? -%>
+<% if 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-langpack-en && dnf clean all && rm -rf /var/cache/dnf/*
 <% if dist == 'el8' -%>

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

@@ -11,11 +11,6 @@ chown -R "$OOD_UID:$OOD_GID" <%= ctr_home %>
 groupmod -o -g "$OOD_GID" <%= ctr_user %>
 usermod -o -u "$OOD_UID" -g "$OOD_GID" <%= ctr_user %> 2>/dev/null 1>/dev/null
 
-set +e
-SCL_SOURCE="$(command -v scl_source)"
-[[ "${SCL_SOURCE}" ]] && source "${SCL_SOURCE}" enable "<%= scl_ruby %>" &> /dev/null
-set -e
-
 if [[ $# -gt 0 ]]; then
 	exec "$@"
 fi

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

@@ -46,10 +46,6 @@ run chmod 440 /etc/sudoers.d/ood
 header "Setup RPM env"
 sudo -u <%= ctr_user %> -H cat > <%= ctr_rpmmacros %> <<EOF
 %_topdir <%= work_dir %>
-<%- # Workaround to weird issue with debuginfo stripping -%>
-<% if dist == 'el7' -%>
-%_builddir %{_topdir}/rpmbuild/BUILD
-<% end -%>
 %_signature gpg
 %_gpg_path <%= ctr_gpg_dir %>
 %_gpg /usr/bin/gpg
@@ -76,11 +72,7 @@ echo "allow-loopback-pinentry" >> <%= ctr_gpg_dir %>/gpg-agent.conf
 <%- end -%>
 
 header "Install ood_packaging gem"
-<%- 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
-<%- end -%>
 
 header "Copy in launch scripts"
 run mkdir -p <%= ctr_scripts_dir %>

data/lib/ood_packaging/build_box.rb

@@ -10,7 +10,6 @@ class OodPackaging::BuildBox
   include FileUtils
 
   BASE_IMAGES = {
-    'el7'          => 'centos:7',
     'el8'          => 'almalinux:8',
     'el9'          => 'almalinux:9',
     'ubuntu-20.04' => 'ubuntu:20.04',
@@ -63,19 +62,12 @@ class OodPackaging::BuildBox
 
   def dnf?
     return false unless rpm?
-    return false if dist == 'el7'
 
     true
   end
 
-  def scl?
-    return true if dist == 'el7'
-
-    false
-  end
-
   def legacy_gpg?
-    return true if ['el7', 'el8'].include?(dist)
+    return true if ['el8'].include?(dist)
 
     false
   end

data/lib/ood_packaging/package.rb

@@ -192,7 +192,6 @@ class OodPackaging::Package
   def exec_rake
     cmd = []
     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 ['-f', File.join(ctr_scripts_dir, 'Rakefile'), 'ood_packaging:package:build']

data/lib/ood_packaging/tasks.rb

@@ -96,11 +96,6 @@ namespace :ood_packaging do
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
-    desc 'Package sqlite'
-    task :sqlite, [:dist, :arch] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
-    end
-
     desc 'Package ondemand_exporter'
     task :ondemand_exporter, [:dist, :arch] do |t, args|
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])

data/lib/ood_packaging/utils.rb

@@ -63,15 +63,9 @@ module OodPackaging::Utils
   end
 
   def ruby_version
-    return '3.0' if dist == 'el7'
-
     '3.1'
   end
 
-  def scl_ruby
-    "rh-ruby#{ruby_version.tr('.', '')}"
-  end
-
   def nodejs_version
     '18'
   end

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.13.5'
+  VERSION = '0.14.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.1.1',
@@ -12,12 +12,11 @@ module OodPackaging
       '(ubuntu|debian)' => '3',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.1.3',
+    'ondemand-runtime'        => '3.1.4',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.17',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.14.1',
-    'sqlite'                  => '3.26.0-4',
     'ondemand_exporter'       => '0.10.0',
     'ondemand-compute'        => {
       '(ubuntu|debian)' => '3.1.0',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.14.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake