openstack
/
fuel-qa
Code Issues Proposed changes

Remove mandatory snapshoting in cluster upgrade 

During testing we got several issues in ceph + clock screw.
We need snapshots only for development testing, testing on CI
can be done without snapshots. Removing is_make=True argument
and add additional sync_time call if we are in debugging mode.

Related-bug:1622642
Change-Id: I28c5c2a84a0c732d01f78d09deeb86d81a295fd5
This commit is contained in:
Vladimir Khlyunev 2016-09-14 19:40:59 +03:00
parent 15681971a6
commit 18bbd886e6
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fuelweb_test/tests/tests_upgrade/test_os_upgrade.py
View File

@ -18,6 +18,7 @@ from proboscis import test
from fuelweb_test import logger
from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.settings import MAKE_SNAPSHOT
from fuelweb_test.tests.tests_upgrade.upgrade_base import OSUpgradeBase
@ -43,6 +44,11 @@ class TestOSupgrade(OSUpgradeBase):
self.check_release_requirements()
self.check_run('os_upgrade_env')
self.env.revert_snapshot("upgrade_ceph_ha_restore")
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.install_octane()
release_id = self.upgrade_release(use_net_template=False)
@ -63,7 +69,7 @@ class TestOSupgrade(OSUpgradeBase):
self.upgrade_env_code(release_id=release_id)
self.env.make_snapshot("os_upgrade_env", is_make=True)
self.env.make_snapshot("os_upgrade_env")
@test(depends_on=[os_upgrade_env], groups=["upgrade_first_cic"])
@log_snapshot_after_test
@ -91,7 +97,7 @@ class TestOSupgrade(OSUpgradeBase):
self.upgrade_first_controller_code(seed_cluster_id)
self.env.make_snapshot("upgrade_first_cic", is_make=True)
self.env.make_snapshot("upgrade_first_cic")
@test(depends_on=[upgrade_first_cic],
groups=["upgrade_db"])
@ -107,12 +113,15 @@ class TestOSupgrade(OSUpgradeBase):
6. Check upgrade status
"""
self.check_release_requirements()
self.check_run('upgrade_db')
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_first_cic")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.install_octane()
self.show_step(2)
@ -120,7 +129,7 @@ class TestOSupgrade(OSUpgradeBase):
self.upgrade_db_code(seed_cluster_id)
self.env.make_snapshot("upgrade_db", is_make=True)
self.env.make_snapshot("upgrade_db")
@test(depends_on=[upgrade_db],
groups=["upgrade_ceph"])
@ -140,6 +149,10 @@ class TestOSupgrade(OSUpgradeBase):
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_db")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.install_octane()
self.show_step(2)
@ -147,7 +160,7 @@ class TestOSupgrade(OSUpgradeBase):
self.upgrade_ceph_code(seed_cluster_id)
self.env.make_snapshot("upgrade_ceph", is_make=True)
self.env.make_snapshot("upgrade_ceph")
@test(depends_on=[upgrade_ceph],
groups=["upgrade_controllers"])
@ -176,6 +189,10 @@ class TestOSupgrade(OSUpgradeBase):
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_ceph")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.install_octane()
self.show_step(2)
@ -189,7 +206,7 @@ class TestOSupgrade(OSUpgradeBase):
self.upgrade_controllers_code(seed_cluster_id)
self.env.make_snapshot("upgrade_controllers", is_make=True)
self.env.make_snapshot("upgrade_controllers")
@test(depends_on=[upgrade_controllers], groups=["upgrade_ceph_osd"])
@log_snapshot_after_test
@ -210,6 +227,10 @@ class TestOSupgrade(OSUpgradeBase):
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_controllers")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.install_octane()
self.show_step(2)
@ -217,7 +238,7 @@ class TestOSupgrade(OSUpgradeBase):
self.upgrade_ceph_osd_code(seed_cluster_id)
self.env.make_snapshot("upgrade_ceph_osd", is_make=True)
self.env.make_snapshot("upgrade_ceph_osd")
@test(depends_on=[upgrade_ceph_osd],
groups=["upgrade_old_nodes"])
@ -237,6 +258,10 @@ class TestOSupgrade(OSUpgradeBase):
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_ceph_osd")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.install_octane()
self.show_step(2)
@ -257,7 +282,7 @@ class TestOSupgrade(OSUpgradeBase):
self.minimal_check(seed_cluster_id=seed_cluster_id, nwk_check=True)
self.env.make_snapshot("upgrade_old_nodes", is_make=True)
self.env.make_snapshot("upgrade_old_nodes")
@test(depends_on=[upgrade_old_nodes],
groups=['cleanup_no_live', 'upgrade_cloud_no_live_migration'])
@ -277,6 +302,10 @@ class TestOSupgrade(OSUpgradeBase):
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_old_nodes")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.show_step(2)
seed_cluster_id = self.fuel_web.get_last_created_cluster()
@ -311,6 +340,10 @@ class TestOSupgrade(OSUpgradeBase):
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_ceph_osd")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.install_octane()
self.show_step(2)
@ -333,7 +366,7 @@ class TestOSupgrade(OSUpgradeBase):
self.minimal_check(seed_cluster_id=seed_cluster_id, nwk_check=True)
self.env.make_snapshot("upgrade_nodes_live_migration", is_make=True)
self.env.make_snapshot("upgrade_nodes_live_migration")
@test(depends_on=[upgrade_nodes_live_migration],
groups=['cleanup_live', 'upgrade_cloud_live_migration'])
@ -353,6 +386,10 @@ class TestOSupgrade(OSUpgradeBase):
self.show_step(1, initialize=True)
self.env.revert_snapshot("upgrade_old_nodes")
if MAKE_SNAPSHOT:
# some paranoid time sync sequence
self.env.sync_time(["admin"])
self.env.sync_time()
self.show_step(2)
seed_cluster_id = self.fuel_web.get_last_created_cluster()