ood_packaging 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20207d3a5c14f026a4a323e89b798587982fbdc5196feb526d92eafd5e15dfd6
-  data.tar.gz: e88d600b4b794806a04437cda4270670928fa43442d942910d7d6be71907ff79
+  metadata.gz: d301aee2821f7e83dbf3caf625871a3d8d938e5280ce8cdf092257dbd764d5f7
+  data.tar.gz: fe564b821d0cc7c8a5a094f4b110aee8c5e0a4ebf5d073cb8bd93cdc88ded585
 SHA512:
-  metadata.gz: 33fe2b13d407320c92b1435180d46fe458465e332fd7c9f022c47510245c32a4b42c62a61b707d3062596aa08631d5ee134f48e350592e6ef09c15be58a5672e
-  data.tar.gz: 28b8a94a75d8a9d10de8bd6c36198a20b55976c28e066371d999db5c2fada1cb2a029eef0b9988388f368b67112ca893caf58979e30d8dcd7a4f249167deb507
+  metadata.gz: 3b91c002309b28ccf7266b44502689fc888d225ae8682e5c8a3374f2ff77bff6ffd28cf64dacd526253cc69fecef1fc7a59d3c24c73cdcbbacd3eb5374018097
+  data.tar.gz: 0d2c3272f19de52cd1f30f4b956193c497e8ef2186b0a0bf36cac0d670f9368fc80f988bf4d389774e46198c80b78529bd00fc4a4ffa344c6efcaaf8d74185dc

data/lib/ood_packaging/build.rb

@@ -57,6 +57,12 @@ class OodPackaging::Build
     version.gsub(/^v/, '').gsub('-', '.')
   end
 
+  def deb_chlog_version
+    return "#{deb_version}-#{build_box.codename}" if config[:codename_version]
+
+    deb_version
+  end
+
   def rpm_defines
     defines = ["--define 'git_tag #{version}'"]
     defines.concat ["--define 'package_version #{rpm_version}'"]
@@ -172,6 +178,7 @@ class OodPackaging::Build
     end
     puts "\tBootstrap work dir".blue
     sh "mkdir -p #{work_dir}/{RPMS,SRPMS,SOURCES,SPECS,rpmbuild/BUILD}"
+    bootstrap_rpm_packages! if config[:bootstrap_packages]
     bootstrap_copy_source!
     bootstrap_get_source!
   end
@@ -183,6 +190,17 @@ class OodPackaging::Build
     sh "sudo rpm --import #{ENV['GPG_PUBKEY']}#{cmd_suffix}" if ENV['GPG_PUBKEY']
   end
 
+  def bootstrap_rpm_packages!
+    return if config[:bootstrap_packages].nil?
+
+    cmd = ['sudo', 'dnf'] if build_box.dnf?
+    cmd = ['sudo', 'yum'] unless build_box.dnf?
+    cmd.concat ['install', '-y']
+    cmd.concat config[:bootstrap_packages]
+    puts "\tBootstrapping additional packages".blue
+    sh cmd.join(' ')
+  end
+
   def bootstrap_copy_source!
     puts "\tCopy sources".blue
     if build_box.rpm?
@@ -225,7 +243,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} --controlmaint 'Release #{deb_version}'#{cmd_suffix}"
+      sh "dch -b -v #{deb_chlog_version} --controlmaint 'Release #{deb_chlog_version}'#{cmd_suffix}"
     end
   end
 

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

@@ -14,18 +14,18 @@ RUN rm -f /etc/yum.repos.d/CentOS-Vault.repo /etc/yum.repos.d/CentOS-Sources.rep
 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 dist =~ /^el/ -%>
+<% 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 install -y dnf-utils <%= dist =~ /^el/ ? '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/*
-<% else -%>
+<% elsif dist == 'el9' -%>
 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 && \
+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' : '' %> && \
     dnf clean all && rm -rf /var/cache/dnf/*
 <% elsif dist =~ /^ubuntu|debian/ -%>
 ENV DEBIAN_FRONTEND=noninteractive

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

@@ -20,7 +20,7 @@ header "Add OnDemand build repo"
 cat > /etc/yum.repos.d/ondemand-web.repo <<EOF
 [ondemand-web]
 name=Open OnDemand Web Repo
-baseurl=https://yum.osc.edu/ondemand/build/<%= ondemand_repo_version %>/web/el\$releasever/\$basearch/
+baseurl=<%= ondemand_rpm_repo_baseurl %>
 enabled=1
 gpgcheck=0
 EOF

data/lib/ood_packaging/build_box.rb

@@ -14,7 +14,8 @@ class OodPackaging::BuildBox
     'el8'          => 'rockylinux/rockylinux:8',
     'el9'          => 'almalinux:9',
     'ubuntu-20.04' => 'ubuntu:20.04',
-    'ubuntu-22.04' => 'ubuntu:22.04'
+    'ubuntu-22.04' => 'ubuntu:22.04',
+    'amzn2023'     => 'amazonlinux:2023'
   }.freeze
 
   CODENAMES = {
@@ -38,7 +39,7 @@ class OodPackaging::BuildBox
   end
 
   def rpm?
-    dist.start_with?('el')
+    dist.start_with?('el') || dist.start_with?('amzn')
   end
 
   def deb?
@@ -130,6 +131,7 @@ class OodPackaging::BuildBox
   def build!
     scripts
     cmd = [container_runtime, 'build']
+    cmd.concat ['--platform', 'linux/amd64']
     cmd.concat ['--tag', image_tag]
     cmd.concat [ENV['OOD_PACKAGING_BUILD_BOX_ARGS']] if ENV['OOD_PACKAGING_BUILD_BOX_ARGS']
     cmd.concat ['-f', dockerfile]

data/lib/ood_packaging/package.rb

@@ -276,6 +276,7 @@ class OodPackaging::Package
 
   def container_start!
     cmd = [container_runtime, 'run', '--detach', '--rm']
+    cmd.concat ['--platform', 'linux/amd64']
     cmd.concat ['--name', container_name]
     cmd.concat rt_specific_flags
     cmd.concat container_mounts

data/lib/ood_packaging/tasks.rb

@@ -69,11 +69,16 @@ namespace :ood_packaging do
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
     end
 
-    desc 'Package ondemand-release'
+    desc 'Package ondemand-runtime'
     task :'ondemand-runtime', [:dist] do |t, args|
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
     end
 
+    desc 'Package scl-utils'
+    task :'scl-utils', [:dist] do |t, args|
+      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])
+    end
+
     desc 'Package passenger'
     task :passenger, [:dist] do |t, args|
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist])

data/lib/ood_packaging/utils.rb

@@ -55,7 +55,11 @@ module OodPackaging::Utils
   end
 
   def ondemand_repo_version
-    '3.0'
+    '3.1'
+  end
+
+  def ondemand_rpm_repo_baseurl
+    "https://yum.osc.edu/ondemand/build/#{ondemand_repo_version}/web/#{dist}/\\$basearch/"
   end
 
   def ruby_version

data/lib/ood_packaging/version.rb

@@ -2,25 +2,26 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.6.1'
+  VERSION = '0.8.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
-      '(ubuntu|debian)' => '3.0.0',
-      'default'         => '3.0'
+      '(ubuntu|debian)' => '3.1.0',
+      'default'         => '3.1'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',
-      'default'         => '1-7'
+      'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.0.0',
-    'passenger'               => '6.0.14',
+    'ondemand-runtime'        => '3.1.1',
+    'scl-utils'               => '2.0.3',
+    'passenger'               => '6.0.17',
     'cjose'                   => '0.6.1',
-    'mod_auth_openidc'        => '2.4.5',
+    'mod_auth_openidc'        => '2.4.14.1',
     'sqlite'                  => '3.26.0-4',
     'ondemand_exporter'       => '0.9.0',
     'ondemand-compute'        => {
-      '(ubuntu|debian)' => '3.0.0',
-      'default'         => '3.0.0'
+      '(ubuntu|debian)' => '3.1.0',
+      'default'         => '3.1.0'
     },
     'python-websockify'       => '0.10.0',
     'turbovnc'                => '2.2.5'

metadata

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