ood_packaging 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51a2fbe9aafffdac24ce60810f83bd8543f5ed67fa9a8a65fa80d1df734d7ad
-  data.tar.gz: 604b28d71ce2096bea2c10ee98c92d2df6fa2ad531c9515a2b6b6878967e174d
+  metadata.gz: a9461da8cd353e3ba27bdb6dad55c760c05774c119cdfa1beb4b9c9f82f405c6
+  data.tar.gz: cbb451665ca4a8037b1198e15b0362bba436ae5df718f3c788a5f6ff7f0fdc8e
 SHA512:
-  metadata.gz: c5bf47ca5110bbb6c0434aa1bde8bf661d3b2dcf14ee037a9aff9ca1369d5c3819443daf41287508b40e58c7c4f6c95a31cc15bdee960d09a4a293188ec522d8
-  data.tar.gz: 2a065fa4a4c234d512102e7923f1f8e8f487be14f2c8a5bddd7011dd3014a512e9a046d6e8381e75c3b3101fe3da8c942f32ed1eee2b2b323b8a321af14208cc
+  metadata.gz: a2a50f054349dfb64d400a5a5a700b1a31fd568d143fe70444b8c7c5ca381a172ca19ae4f25998dfd5c6b0e6cfc16ccaaa9cc47c7d8798be74a54d403a78599e
+  data.tar.gz: 031eef1b4ea2d4cfc24d042be9aaf40636212b0ffb39eacfd3914fe8a173d1e8865acea1e117c64e889d07e7ab0f70e34949b0dad088a739be9d581f6f3e319b

data/lib/ood_packaging/build.rb

@@ -199,8 +199,8 @@ class OodPackaging::Build
   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 = ['sudo', '-E', 'dnf'] if build_box.dnf?
+    cmd = ['sudo', '-E', 'yum'] unless build_box.dnf?
     cmd.concat ['install', '-y']
     cmd.concat config[:bootstrap_packages]
     puts "\tBootstrapping additional packages".blue
@@ -263,7 +263,7 @@ class OodPackaging::Build
   end
 
   def install_rpm_dependencies!
-    cmd = ['sudo']
+    cmd = ['sudo', '-E']
     cmd.concat [build_box.package_manager, 'builddep'] if build_box.dnf?
     cmd.concat ['yum-builddep'] if build_box.package_manager == 'yum'
     cmd.concat ['-y']

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

@@ -23,6 +23,8 @@ name=Open OnDemand Web Repo
 baseurl=<%= ondemand_rpm_repo_baseurl %>
 enabled=1
 gpgcheck=0
+username=\$REPO_USERNAME
+password=\$REPO_PASSWORD
 EOF
 <% if legacy_gpg? -%>
 run rpm --import /build/RPM-GPG-KEY-ondemand

data/lib/ood_packaging/package.rb

@@ -351,6 +351,8 @@ class OodPackaging::Package
       'DEBUG'         => debug?
     }
     env['GPG_PUBKEY'] = '/gpg.pub' if @config[:gpg_pubkey]
+    env['DNF_VAR_REPO_USERNAME'] = ondemand_rpm_repo_username
+    env['DNF_VAR_REPO_PASSWORD'] = ENV['OOD_REPO_PASSWORD'] if ENV['OOD_REPO_PASSWORD']
     env
   end
 end

data/lib/ood_packaging/utils.rb

@@ -59,7 +59,11 @@ module OodPackaging::Utils
   end
 
   def ondemand_rpm_repo_baseurl
-    "https://yum.osc.edu/ondemand/build/#{ondemand_repo_version}/web/#{dist}/\\$basearch/"
+    "https://yum.osc.edu/ondemand/staging/#{ondemand_repo_version}/web/#{dist}/\\$basearch/"
+  end
+
+  def ondemand_rpm_repo_username
+    ENV['OOD_REPO_USERNAME'] || 'osc'
   end
 
   def ruby_version

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.22.1'
+  VERSION = '0.23.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '4.2.0',
@@ -18,7 +18,7 @@ module OodPackaging
       '(ubuntu|debian)' => '6.1.2',
       'default'         => '6.1.2-1'
     },
-    'ondemand_exporter'       => '0.11.2',
+    'ondemand_exporter'       => '0.12.0',
     'ondemand-compute'        => {
       '(ubuntu|debian)' => '4.2.0',
       'default'         => '4.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-15 00:00:00.000000000 Z
+date: 2026-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -43,14 +57,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.72.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.72.0
 - !ruby/object:Gem::Dependency