openstack
/
fuel-main
Code Issues Proposed changes

[5.0.1]Leave single tarball_path variable 

We decide to use 1 tarball for
upgrade and update tests, so we leave only
1 variable for this

Change-Id: Ibc794787ddd8874676021ce35bf44a3c966402da
Partly Cherry-picked from
https://review.openstack.org/#/c/110703/3
This commit is contained in:
Tatyana Leontovich 2014-08-04 14:24:17 +00:00
parent f78dd3a3b7
commit 77423fe5a0
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelweb_test/settings.py
View File

@ -223,7 +223,7 @@ NEUTRON_SEGMENT_TYPE = os.environ.get('NEUTRON_SEGMENT_TYPE',
# TarBall data for updates and upgrades
UPGRADE_TARBALL_PATH = os.environ.get('UPGRADE_TARBALL_PATH')
TARBALL_PATH = os.environ.get('TARBALL_PATH')
UPGRADE_FUEL_FROM = os.environ.get('UPGRADE_FUEL_FROM', '5.0')
UPGRADE_FUEL_TO = os.environ.get('UPGRADE_FUEL_TO', '5.0.1')

39
fuelweb_test/tests/test_upgrade.py
View File

@ -48,14 +48,13 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
self.env.revert_snapshot("deploy_simple_cinder")
cluster_id = self.fuel_web.get_last_created_cluster()
checkers.upload_tarball(self.env.get_admin_remote(),
hlp_data.UPGRADE_TARBALL_PATH, '/var')
hlp_data.TARBALL_PATH, '/var')
checkers.check_tarball_exists(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH),
TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
os.path.basename(hlp_data.TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000)
checkers.check_upgraded_containers(self.env.get_admin_remote(),
@ -100,14 +99,12 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
available_releases_before = self.fuel_web.get_releases_list_for_os(
release_name=hlp_data.OPENSTACK_RELEASE)
checkers.upload_tarball(self.env.get_admin_remote(),
hlp_data.UPGRADE_TARBALL_PATH, '/var')
hlp_data.TARBALL_PATH, '/var')
checkers.check_tarball_exists(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH),
os.path.basename(hlp_data.TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
os.path.basename(hlp_data.TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000)
checkers.check_upgraded_containers(self.env.get_admin_remote(),
@ -178,14 +175,12 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
available_releases_before = self.fuel_web.get_releases_list_for_os(
release_name=hlp_data.OPENSTACK_RELEASE)
checkers.upload_tarball(self.env.get_admin_remote(),
hlp_data.UPGRADE_TARBALL_PATH, '/var')
hlp_data.TARBALL_PATH, '/var')
checkers.check_tarball_exists(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH),
os.path.basename(hlp_data.TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
os.path.basename(hlp_data.TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000)
checkers.check_upgraded_containers(self.env.get_admin_remote(),
@ -251,14 +246,12 @@ class RollbackFuelMaster(base_test_data.TestBasic):
self.env.revert_snapshot("deploy_simple_cinder")
cluster_id = self.fuel_web.get_last_created_cluster()
checkers.upload_tarball(self.env.get_admin_remote(),
hlp_data.UPGRADE_TARBALL_PATH, '/var')
hlp_data.TARBALL_PATH, '/var')
checkers.check_tarball_exists(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH),
os.path.basename(hlp_data.TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
os.path.basename(hlp_data.TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000)
checkers.check_upgraded_containers(self.env.get_admin_remote(),
@ -301,14 +294,12 @@ class RollbackFuelMaster(base_test_data.TestBasic):
self.env.revert_snapshot("deploy_neutron_gre")
cluster_id = self.fuel_web.get_last_created_cluster()
checkers.upload_tarball(self.env.get_admin_remote(),
hlp_data.UPGRADE_TARBALL_PATH, '/var')
hlp_data.TARBALL_PATH, '/var')
checkers.check_tarball_exists(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH),
os.path.basename(hlp_data.TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
os.path.basename(hlp_data.TARBALL_PATH), '/var')
self.fuel_web.modify_python_file(self.env.get_admin_remote(),
"83i \ \ \ \ \ \ \ \ raise errors."
"ExecutedErrorNonZeroExitCode('{0}')"