openstack
/
fuel-main
Code Issues Proposed changes

Merge "Leave single tarball_path variable"

This commit is contained in:
Jenkins 2014-08-04 10:41:21 +00:00 committed by Gerrit Code Review
parent e99879292c 65816d9b0d
commit 6b05280621
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuelweb_test/settings.py
View File

@ -232,10 +232,9 @@ FUEL_SETTINGS_YAML = os.environ.get('FUEL_SETTINGS_YAML',
'/etc/fuel/astute.yaml')
# 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.1')
UPDATE_TARBALL_PATH = os.environ.get('UPDATE_TARBALL_PATH')
SNAPSHOT = os.environ.get('SNAPSHOT', '')

32
fuelweb_test/tests/test_upgrade.py
View File

@ -49,14 +49,14 @@ 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')
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,
phrase='*** UPGRADE DONE SUCCESSFULLY')
@ -103,14 +103,14 @@ 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),
TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
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,
phrase='*** UPGRADE DONE SUCCESSFULLY')
@ -179,14 +179,14 @@ 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),
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,
phrase='*** UPGRADE DONE SUCCESSFULLY')
@ -254,14 +254,14 @@ 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),
TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
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,
phrase='*** UPGRADE DONE SUCCESSFULLY')
@ -306,14 +306,14 @@ 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),
TARBALL_PATH),
'/var')
checkers.untar(self.env.get_admin_remote(),
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
TARBALL_PATH), '/var')
self.fuel_web.modify_python_file(self.env.get_admin_remote(),
"80i \ \ \ \ \ \ \ \ raise errors."
"ExecutedErrorNonZeroExitCode('{0}')"

8
fuelweb_test/tests/tests_os_patching/test_os_patching.py
View File

@ -63,19 +63,19 @@ class TestPatch(TestBasic):
logger.info("Start upload upgrade archive")
node_ssh = self.env.get_ssh_to_remote(self.fuel_web.admin_node_ip)
checkers.upload_tarball(
node_ssh=node_ssh, tar_path=hlp_data.UPDATE_TARBALL_PATH,
node_ssh=node_ssh, tar_path=hlp_data.TARBALL_PATH,
tar_target='/var/tmp')
logger.info("Archive should upload. "
"Lets check that it exists on master node ...")
checkers.check_tarball_exists(node_ssh, os.path.basename(
hlp_data.UPDATE_TARBALL_PATH), '/var/tmp')
hlp_data.TARBALL_PATH), '/var/tmp')
logger.info("Extract archive to the /var/tmp")
checkers.untar(node_ssh, os.path.basename(
hlp_data.UPDATE_TARBALL_PATH), '/var/tmp')
hlp_data.TARBALL_PATH), '/var/tmp')
logger.info("Get release ids for deployed operation"
" system before upgrade..")
@ -109,7 +109,7 @@ class TestPatch(TestBasic):
checkers.wait_upgrade_is_done(node_ssh=node_ssh,
phrase='*** UPGRADE DONE SUCCESSFULLY',
timeout=60 * 10)
timeout=600 * 10)
logger.info('Get release ids list after upgrade')
available_releases_after = self.fuel_web.get_releases_list_for_os(