Skip to content

Commit

Permalink
Merge pull request #8698 from nodeg/cleanup_nested_leftovers
Browse files Browse the repository at this point in the history
QE: Remove nested VM leftovers
  • Loading branch information
deneb-alpha authored May 6, 2024
2 parents 37cfecf + 260f226 commit 98e0bcc
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion testsuite/documentation/cucumber-steps.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Possible values are currently:
| Debian-like Salt minion | ```$deblike_minion``` | ```$DEBLIKE_MINION``` | ```"deblike_minion"``` | ```"minion"``` |
| PXE-boot minion | None | ```$PXEBOOT_MAC``` | ```"pxeboot_minion"``` | ```"pxeboot"``` |
| KVM virtual host minion | ```$kvm_server``` | ```$VIRTHOST_KVM_URL``` and ```$VIRTHOST_KVM_PASSWORD``` | ```"kvm_server"``` | ```"virthost"``` |
| Salt bundle migration minion (nested VM) | ```$salt_migration_minion``` | ```$MIN_NESTED``` | ```"salt_migration_minion"``` | ```"virthost"``` |

These names are such for historical reasons and might be made better in the future.

Expand Down
2 changes: 1 addition & 1 deletion testsuite/features/step_definitions/vm_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
name = 'sles-disk-image-template.qcow2'
net = 'salt-sles'
os = 'sle15sp4'
mac = ENV.fetch('MAC_MIN_NESTED', 'RANDOM')
mac = 'RANDOM'
when 'rhlike'
name = 'rhlike-disk-image-template.qcow2'
net = 'salt-rhlike'
Expand Down
2 changes: 0 additions & 2 deletions testsuite/features/support/twopence_env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
warn 'SSH minion IP address or domain name variable empty' if ENV['SSH_MINION'].nil?
warn 'PXE boot MAC address variable empty' if ENV['PXEBOOT_MAC'].nil?
warn 'KVM server minion IP address or domain name variable empty' if ENV['VIRTHOST_KVM_URL'].nil?
warn 'Nested VM hostname empty' if ENV['MIN_NESTED'].nil?
warn 'Nested VM MAC address empty' if ENV['MAC_MIN_NESTED'].nil?
end

# Dictionaries to obtain host or node from the Twopence objects
Expand Down

0 comments on commit 98e0bcc

Please sign in to comment.