Bug 1176358. Backout purging builds for Firefox UI tests (0d90dde16f08). r=backout
--- a/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -13,58 +13,46 @@ import sys
import os
from mozharness.base.python import (
PreScriptAction,
VirtualenvMixin,
virtualenv_config_options,
)
from mozharness.mozilla.vcstools import VCSToolsScript
-from mozharness.mozilla.purge import PurgeMixin
-class FirefoxUITests(VCSToolsScript, VirtualenvMixin, PurgeMixin):
+class FirefoxUITests(VCSToolsScript, VirtualenvMixin):
config_options = [
[['--firefox-ui-repo'], {
'dest': 'firefox_ui_repo',
'default': 'https://github.com/mozilla/firefox-ui-tests.git',
'help': 'which firefox_ui_tests repo to use',
}],
[['--firefox-ui-branch'], {
'dest': 'firefox_ui_branch',
'help': 'which branch to use for firefox_ui_tests',
}],
] + copy.deepcopy(virtualenv_config_options)
- def __init__(self,
- config={},
- config_options=[],
- all_actions=[],
- **kwargs):
- default_config = {
- 'purge_minsize': 2,
- }
- default_config.update(config)
+ def __init__(self, config_options=[], all_actions=[], **kwargs):
self.config_options += config_options
if all_actions is None:
# Default actions
all_actions = [
- 'purge-builds',
'clobber',
'checkout',
'create-virtualenv',
'run-tests',
]
super(FirefoxUITests, self).__init__(
config_options=self.config_options,
- require_config_file=True,
- config=default_config,
all_actions=all_actions,
**kwargs
)
self.firefox_ui_repo = self.config['firefox_ui_repo']
self.firefox_ui_branch = self.config.get('firefox_ui_branch')
if not self.firefox_ui_branch:
--- a/scripts/firefox_ui_updates.py
+++ b/scripts/firefox_ui_updates.py
@@ -98,17 +98,16 @@ class FirefoxUIUpdates(FirefoxUITests):
'dest': 'installer_path',
'help': 'Point to an installer to test against.',
}],
] + copy.deepcopy(self.harness_extra_args)
super(FirefoxUIUpdates, self).__init__(
config_options=config_options,
all_actions=[
- 'purge-builds',
'clobber',
'checkout',
'create-virtualenv',
'determine-testing-configuration',
'run-tests',
],
append_env_variables_from_configs=True,
)