Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .packit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ jobs:
- job: copr_build
trigger: pull_request
targets:
rhel-8:
additional_modules: "foreman-devel:el8"
additional_repos:
- https://yum.theforeman.org/releases/nightly/el8/x86_64/
- https://yum.theforeman.org/plugins/nightly/el8/x86_64/
rhel-9:
additional_modules: "foreman-devel:el9"
additional_repos:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def parse_args(args = {})
if args[:provision_method] == 'bootdisk'
args[:cdroms] = [new_cdrom]
args[:boot_order] = %w[cdrom disk]
args[:boot_retry] = 10
args[:boot_retry] = 10 * 1000 # boot_retry is in ms. Shortest is 10s
end
args
end
Expand Down
5 changes: 3 additions & 2 deletions test/unit/concerns/compute_resources/vmware_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class VmwareTest < ActiveSupport::TestCase
mock_client.expects(:servers).returns(mock_servers)
mock_servers.expects(:new).with do |opts|
assert_equal opts[:boot_order], %w[cdrom disk]
assert_equal opts[:boot_retry], 10
assert_equal opts[:boot_retry], 10000
assert_includes opts[:cdroms], mock_cdrom
end
@cr.expects(:new_cdrom).returns(mock_cdrom)
Expand All @@ -62,9 +62,10 @@ class VmwareTest < ActiveSupport::TestCase
attrs_out = {
cpus: '1',
provision_method: 'bootdisk',
firmware: 'bios',
cdroms: [mock_cdrom],
boot_order: %w[cdrom disk],
boot_retry: 10
boot_retry: 10000
}
assert_equal attrs_out, @cr.parse_args(attrs_in)
end
Expand Down