foreman_bootdisk 23.2.4 → 24.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8219b320fe41315c074cdbee38da3ef5ee21a5dbc767dbd50cff9d5bff85c778
-  data.tar.gz: 12fe11583700845f8c1ddcf1dd7b0e3b4d6ee515f84e598d85efbc25e071d9c6
+  metadata.gz: 1ac9d004cd74a553ef76cdcaa091b3071d05e93e727fe3ec0d5f6e00330bd1ee
+  data.tar.gz: d1dfefd6e23bb9d18539c4c30eecf6a43c45e6851a1ea6bc95135cb9851bb038
 SHA512:
-  metadata.gz: 87d49409c4d8f4bf0ef127ab72f0e18ef024b00869e9096c43cbb9a3ec392105f3789194f4cc88738c17af196c74275bde01654a35a5e27e4364ff84a1c8e2d5
-  data.tar.gz: '07931bd1a6eea3568f5c5f99de4fd1bca07564fb192f7945f827b78ad0fbd26cbaf70b6e1b152f89e55ba58ada64391cdd6728556dae9b60cdb42e0365a8e41e'
+  metadata.gz: 027bd65f741d4e4610774251b84c0a362ac72d68067b3bf44b4d307823b064f8409106b02b629ed2d9099112525db593a6216dcfdc2e52f627755b5b9b05d84b
+  data.tar.gz: fed16d5eae70be6e07c394b78e2563a6729236f86426ba27a6776ba60a4f7beda53cd251c1a24f3bc1223b91921745eb8cbbc2e99ecc31d8aa7b02a214be0912

data/README.md

@@ -27,7 +27,7 @@ Debian users can install the "ruby-foreman-bootdisk" package.
 
 * iPXE images are required
 * syslinux is required
-* genisoimage/mkisofs and isohybrid are required
+* xorrisofs (or genisoimage/mkisofs) and isohybrid are required
 
 gPXE images are unsupported due to lack of initrd support.
 
@@ -328,7 +328,10 @@ the Foreman UI.
 * _iPXE directory_ (`bootdisk_ipxe_dir`) points to the directory containing
   ipxe.lkrn
 * _ISO generation command_ (`bootdisk_mkiso_command`) is the name of
-  genisoimage/mkisofs on your OS
+  xorrisofs, genisoimage, or mkisofs on your OS. Defaults to `xorrisofs`
+  since EL10 dropped genisoimage/cdrkit; EL9 and earlier can still be
+  pointed at `genisoimage` or `mkisofs` if preferred, all three names
+  resolve to the same underlying tool where `xorriso` is installed
 * _SYSLINUX directory_ (`bootdisk_syslinux_dir`) points to the directory
   containing syslinux images
 

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -7,7 +7,7 @@ require 'uri'
 
 # Generates an iPXE ISO hybrid image
 #
-# requires syslinux, ipxe/ipxe-bootimgs, genisoimage, isohybrid
+# requires syslinux, ipxe/ipxe-bootimgs, xorrisofs (or genisoimage/mkisofs), isohybrid
 module ForemanBootdisk
   class ISOGenerator
     extend Foreman::HttpProxy

data/lib/foreman_bootdisk/engine.rb

@@ -112,9 +112,9 @@ module ForemanBootdisk
 
               setting "bootdisk_mkiso_command",
                 type: :string,
-                default: "genisoimage",
+                default: "xorrisofs",
                 full_name: N_("ISO generation command"),
-                description: N_("Command to generate ISO image, use genisoimage or mkisofs")
+                description: N_("Command to generate ISO image, use xorrisofs, genisoimage or mkisofs")
 
               setting "bootdisk_cache_media",
                 type: :boolean,

data/lib/foreman_bootdisk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanBootdisk
-  VERSION = '23.2.4'
+  VERSION = '24.0.0'
 end

data/webpack/global_index.js

@@ -4,9 +4,11 @@ import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 
 import HostBootdiskButtons from './src/extensions/host/HostBootdiskButtons';
 
+const HOST_BOOTDISK_BUTTONS_WEIGHT = 300;
+
 addGlobalFill(
   'host-details-kebab',
   'host-bootdisk-buttons',
   <HostBootdiskButtons key="host-bootdisk-buttons" />,
-  300
+  HOST_BOOTDISK_BUTTONS_WEIGHT
 );

data/webpack/test_setup.js

@@ -0,0 +1 @@
+import 'foremanJSTestSetup';

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 23.2.4
+  version: 24.0.0
 platform: ruby
 authors:
 - Dominic Cleal
@@ -124,7 +124,6 @@ files:
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
 - webpack/__mocks__/foremanReact/redux/API/index.js
 - webpack/global_index.js
-- webpack/global_test_setup.js
 - webpack/index.js
 - webpack/src/extensions/constants.js
 - webpack/src/extensions/host/HostBootdiskButtons.js
@@ -132,6 +131,7 @@ files:
 - webpack/src/extensions/host/HostBootdiskButtonsSelectors.js
 - webpack/src/extensions/host/__tests__/HostBootdiskButtonsSelectors.test.js
 - webpack/src/extensions/host/__tests__/__snapshots__/HostBootdiskButtonsSelectors.test.js.snap
+- webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3.0
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman
 test_files: []

data/webpack/global_test_setup.js

@@ -1,11 +0,0 @@
-// runs before each test to make sure console.error output will
-// fail a test (i.e. default PropType missing). Check the error
-// output and traceback for actual error.
-global.console.error = (error, stack) => {
-  /* eslint-disable-next-line no-console */
-  if (stack) console.log(stack); // Prints out original stack trace
-  throw new Error(error);
-};
-
-// Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
-jest.setTimeout(10000);