зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1203533 - Run create_virtualenv outside mock; r=jlund
This commit is contained in:
Родитель
369572c4b5
Коммит
aac8decfdd
|
@ -161,7 +161,6 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
|
||||||
"list-locales",
|
"list-locales",
|
||||||
"setup",
|
"setup",
|
||||||
"repack",
|
"repack",
|
||||||
"create-virtualenv",
|
|
||||||
"taskcluster-upload",
|
"taskcluster-upload",
|
||||||
"funsize-props",
|
"funsize-props",
|
||||||
"submit-to-balrog",
|
"submit-to-balrog",
|
||||||
|
@ -976,6 +975,14 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
|
||||||
self.warning('Skipping S3 file upload: No taskcluster credentials.')
|
self.warning('Skipping S3 file upload: No taskcluster credentials.')
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# We need to activate the virtualenv so that we can import taskcluster
|
||||||
|
# (and its dependent modules, like requests and hawk). Normally we
|
||||||
|
# could create the virtualenv as an action, but due to some odd
|
||||||
|
# dependencies with query_build_env() being called from build(), which
|
||||||
|
# is necessary before the virtualenv can be created.
|
||||||
|
self.disable_mock()
|
||||||
|
self.create_virtualenv()
|
||||||
|
self.enable_mock()
|
||||||
self.activate_virtualenv()
|
self.activate_virtualenv()
|
||||||
|
|
||||||
# Enable Taskcluster debug logging, so at least we get some debug
|
# Enable Taskcluster debug logging, so at least we get some debug
|
||||||
|
|
Загрузка…
Ссылка в новой задаче