arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround script and files no longer necessary

Browse Source 
By setting the DPkg options for non-interactive the workaround script
and files are no longer necessary for the test automation.
This commit is contained in:
David Ames
2018-09-19 07:40:28 +00:00
parent 0b94bef0d7
commit b1320cefee
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zaza/charm_tests/series_upgrade/tests.py
View File

@@ -39,10 +39,7 @@ class SeriesUpgradeTest(unittest.TestCase):
cls.lts.setUpClass()
cls.from_series = None
cls.to_series = None
# While there are packaging upgrade bugs we need to be cheeky and
# workaround by using the new package's version of files
cls.workaround_script = "/home/ubuntu/package-workarounds.sh"
cls.src_workaround_script = os.path.basename(cls.workaround_script)
cls.workaround_script = None
cls.files = []
def test_100_validate_pre_series_upgrade_cloud(self):
@@ -103,8 +100,6 @@ class TrustyXenialSeriesUpgrade(SeriesUpgradeTest):
super(TrustyXenialSeriesUpgrade, cls).setUpClass()
cls.from_series = "trusty"
cls.to_series = "xenial"
cls.files = [cls.src_workaround_script,
'corosync', 'corosync.conf']
class XenialBionicSeriesUpgrade(SeriesUpgradeTest):
@@ -116,8 +111,6 @@ class XenialBionicSeriesUpgrade(SeriesUpgradeTest):
super(XenialBionicSeriesUpgrade, cls).setUpClass()
cls.from_series = "xenial"
cls.to_series = "bionic"
cls.files = [cls.src_workaround_script,
'corosync', 'corosync.conf', 'haproxy.cfg']
if __name__ == "__main__":