mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1429603: Remove unused `post_upload_extra`, `upload_environment` and `base_post_upload_cmd` from L10N mozharness scripts; r=Callek 

Differential Revision: https://phabricator.services.mozilla.com/D537

--HG--
extra : rebase_source : 8377203bdb271a1813f4393e5290a3d5c1611ed1
This commit is contained in:
Tom Prince 2018-01-31 17:26:41 -07:00
Родитель 1811d37925
Коммит 9e956efed7
6 изменённых файлов: 1 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
taskcluster/ci/l10n/kind.yml
Просмотреть файл

@ -80,19 +80,16 @@ job-template:
config:
by-build-platform:
linux-l10n:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux32.py
- single_locale/tc_common.py
- single_locale/tc_linux32.py
linux64-l10n:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux64.py
- single_locale/tc_common.py
- single_locale/tc_linux64.py
macosx64:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/macosx64.py
- single_locale/tc_common.py

10
taskcluster/ci/nightly-l10n/kind.yml
Просмотреть файл

@ -150,70 +150,60 @@ job-template:
config:
by-build-platform:
linux-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux32.py
- single_locale/tc_common.py
- single_locale/tc_linux32.py
- taskcluster_nightly.py
linux64-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux64.py
- single_locale/tc_common.py
- single_locale/tc_linux64.py
- taskcluster_nightly.py
macosx64-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/macosx64.py
- single_locale/tc_common.py
- single_locale/tc_macosx64.py
- taskcluster_nightly.py
win32-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/win32.py
- single_locale/tc_common.py
- single_locale/tc_win32.py
- taskcluster_nightly.py
win64-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/win64.py
- single_locale/tc_common.py
- single_locale/tc_win64.py
- taskcluster_nightly.py
linux-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux_devedition.py
- single_locale/tc_common.py
- single_locale/tc_linux32.py
- taskcluster_nightly.py
linux64-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux64_devedition.py
- single_locale/tc_common.py
- single_locale/tc_linux64.py
- taskcluster_nightly.py
macosx64-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/macosx64_devedition.py
- single_locale/tc_common.py
- single_locale/tc_macosx64.py
- taskcluster_nightly.py
win32-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/win32_devedition.py
- single_locale/tc_common.py
- single_locale/tc_win32.py
- taskcluster_nightly.py
win64-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/win64_devedition.py
- single_locale/tc_common.py

3
testing/mozharness/configs/single_locale/production.py
Просмотреть файл

@ -1,3 +0,0 @@
config = {
"upload_environment": "prod",
}

6
testing/mozharness/configs/single_locale/staging.py
Просмотреть файл

@ -1,6 +0,0 @@
config = {
"upload_environment": "stage",
'post_upload_extra': ['--bucket-prefix', 'net-mozaws-stage-delivery',
'--url-prefix', 'http://ftp.stage.mozaws.net/',
],
}

16
testing/mozharness/scripts/desktop_l10n.py
Просмотреть файл

@ -57,7 +57,6 @@ configuration_tokens = ('branch',
'update_channel',
'ssh_key_dir',
'stage_product',
'upload_environment',
)
# some other values such as "%(version)s", "%(buildid)s", ...
# are defined at run time and they cannot be enforced in the _pre_config_lock
@ -66,7 +65,7 @@ runtime_config_tokens = ('buildid', 'version', 'locale', 'from_buildid',
'abs_objdir', 'revision',
'to_buildid', 'en_us_binary_url',
'en_us_installer_binary_url', 'mar_tools_url',
'post_upload_extra', 'who')
'who')
# DesktopSingleLocale {{{1
@ -405,8 +404,6 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, BuildbotMixin,
replace_dict = {
'buildid': self._query_buildid(),
'version': self.query_version(),
'post_upload_extra': ' '.join(config.get('post_upload_extra', [])),
'upload_environment': config['upload_environment'],
}
if config['branch'] == 'try':
replace_dict.update({
@ -758,19 +755,8 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, BuildbotMixin,
def make_upload(self, locale):
"""wrapper for make upload command"""
config = self.config
env = self.query_l10n_env()
dirs = self.query_abs_dirs()
buildid = self._query_buildid()
replace_dict = {
'buildid': buildid,
'branch': config['branch']
}
try:
env['POST_UPLOAD_CMD'] = config['base_post_upload_cmd'] % replace_dict
except KeyError:
# no base_post_upload_cmd in configuration, just skip it
pass
target = ['upload', 'AB_CD=%s' % (locale)]
cwd = dirs['abs_locales_dir']
parser = MakeUploadOutputParser(config=self.config,

11
testing/mozharness/scripts/mobile_l10n.py
Просмотреть файл

@ -225,7 +225,6 @@ class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin,
# So we override the branch with something that contains the platform
# name.
replace_dict['branch'] = c['upload_branch']
replace_dict['post_upload_extra'] = ' '.join(c.get('post_upload_extra', []))
upload_env = self.query_env(partial_env=c.get("upload_env"),
replace_dict=replace_dict)
@ -569,27 +568,17 @@ class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin,
"binaries successfully.")
def upload_repacks(self):
c = self.config
dirs = self.query_abs_dirs()
locales = self.query_locales()
make = self.query_exe("make")
base_package_name = self.query_base_package_name()
version = self.query_version()
upload_env = self.query_upload_env()
success_count = total_count = 0
buildnum = None
if c.get('release_config_file'):
rc = self.query_release_config()
buildnum = rc['buildnum']
for locale in locales:
if self.query_failure(locale):
self.warning("Skipping previously failed locale %s." % locale)
continue
total_count += 1
if c.get('base_post_upload_cmd'):
upload_env['POST_UPLOAD_CMD'] = c['base_post_upload_cmd'] % \
{'version': version, 'locale': locale, 'buildnum': str(buildnum),
'post_upload_extra': ' '.join(c.get('post_upload_extra', []))}
output = self.get_output_from_command_m(
# Ugly hack to avoid |make upload| stderr from showing up
# as get_output_from_command errors