Merge "Temporarily replace compute hard reboot by soft reboot test due to BZ1890895"

This commit is contained in:
Zuul 2021-01-21 00:04:18 +00:00 committed by Gerrit Code Review
commit 5b1c7bef5b

View File

@ -68,9 +68,9 @@ class DisruptTripleoNodesTest(testtools.TestCase):
cloud_disruptions.reset_all_controller_nodes() cloud_disruptions.reset_all_controller_nodes()
overcloud_health_checks() overcloud_health_checks()
def test_reboot_computes_recovery(self): def test_soft_reboot_computes_recovery(self):
overcloud_health_checks() overcloud_health_checks()
cloud_disruptions.reset_all_compute_nodes(hard_reset=True) cloud_disruptions.reset_all_compute_nodes(hard_reset=False)
# verify VM status is updated after reboot # verify VM status is updated after reboot
nova.wait_for_all_instances_status('SHUTOFF') nova.wait_for_all_instances_status('SHUTOFF')
# start all VM instance # start all VM instance
@ -78,6 +78,17 @@ class DisruptTripleoNodesTest(testtools.TestCase):
nova.start_all_instances() nova.start_all_instances()
overcloud_health_checks(passive_checks_only=True) overcloud_health_checks(passive_checks_only=True)
# TODO(eolivare): the following test is skipped due to rhbz#1890895
# def test_hard_reboot_computes_recovery(self):
# overcloud_health_checks()
# cloud_disruptions.reset_all_compute_nodes(hard_reset=True)
# # verify VM status is updated after reboot
# nova.wait_for_all_instances_status('SHUTOFF')
# # start all VM instance
# # otherwise sidecar containers will not run after computes reboot
# nova.start_all_instances()
# overcloud_health_checks(passive_checks_only=True)
def test_reboot_controller_main_vip(self): def test_reboot_controller_main_vip(self):
overcloud_health_checks() overcloud_health_checks()
cloud_disruptions.reset_controller_main_vip() cloud_disruptions.reset_controller_main_vip()