From 260f2263f1a8e932313d4b40deb22780c5724f8c Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Mon, 6 May 2024 14:50:41 +0200 Subject: [PATCH] QE: Remove nested VM leftovers Signed-off-by: Dominik Gedon --- testsuite/documentation/cucumber-steps.md | 1 - testsuite/features/step_definitions/vm_steps.rb | 2 +- testsuite/features/support/twopence_env.rb | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/testsuite/documentation/cucumber-steps.md b/testsuite/documentation/cucumber-steps.md index 98e77684c726..b942e8f9e95a 100644 --- a/testsuite/documentation/cucumber-steps.md +++ b/testsuite/documentation/cucumber-steps.md @@ -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. diff --git a/testsuite/features/step_definitions/vm_steps.rb b/testsuite/features/step_definitions/vm_steps.rb index 96c4f34c9134..d0e52ff561bc 100644 --- a/testsuite/features/step_definitions/vm_steps.rb +++ b/testsuite/features/step_definitions/vm_steps.rb @@ -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' diff --git a/testsuite/features/support/twopence_env.rb b/testsuite/features/support/twopence_env.rb index 0d3259303b2b..6e75a41ca76f 100644 --- a/testsuite/features/support/twopence_env.rb +++ b/testsuite/features/support/twopence_env.rb @@ -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