Bug 1337366 - Gecko-specific changes to support mozilla-esr52 r=jlund

MozReview-Commit-ID: KrXbAPLEN2m

--HG--
rename : testing/mozharness/configs/releases/postrelease_firefox_esr45.py => testing/mozharness/configs/releases/postrelease_firefox_esr52.py
rename : testing/mozharness/configs/releases/updates_firefox_esr45.py => testing/mozharness/configs/releases/updates_firefox_esr52.py
rename : testing/mozharness/configs/single_locale/mozilla-esr45.py => testing/mozharness/configs/single_locale/mozilla-esr52.py
extra : rebase_source : 37f89baaba14913b44212bd46e9c79e8f24abf29
This commit is contained in:
Rail Aliiev 2017-02-07 09:21:57 -05:00
Родитель 7b32b62cfa
Коммит 2041d5b067
8 изменённых файлов: 26 добавлений и 115 удалений

Просмотреть файл

@ -11,7 +11,7 @@ config = {
], ],
"tools_repo_url": "https://hg.mozilla.org/build/tools", "tools_repo_url": "https://hg.mozilla.org/build/tools",
"tools_repo_branch": "default", "tools_repo_branch": "default",
"to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-esr45", "to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-esr52",
"migration_behavior": "bump_second_digit", "migration_behavior": "bump_second_digit",
"require_remove_locales": False, "require_remove_locales": False,

Просмотреть файл

@ -1,9 +1,9 @@
import os import os
ABS_WORK_DIR = os.path.join(os.getcwd(), "build") ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
NEW_ESR_REPO = "ssh://hg.mozilla.org/releases/mozilla-esr45" NEW_ESR_REPO = "ssh://hg.mozilla.org/releases/mozilla-esr52"
OLD_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr38" OLD_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr45"
OLD_ESR_CHANGESET = "16351963d75c" OLD_ESR_CHANGESET = "d2d75f526882"
config = { config = {
"log_name": "relese_to_esr", "log_name": "relese_to_esr",
@ -21,17 +21,17 @@ config = {
"MAR_CHANNEL_ID=firefox-mozilla-release", "MAR_CHANNEL_ID=firefox-mozilla-release",
"MAR_CHANNEL_ID=firefox-mozilla-esr"), "MAR_CHANNEL_ID=firefox-mozilla-esr"),
("build/mozconfig.common", ("build/mozconfig.common",
"# Enable checking that add-ons are signed by the trusted root", "# Enable checking that add-ons are signed by the trusted root",
"# Disable checking that add-ons are signed by the trusted root") "# Disable checking that add-ons are signed by the trusted root")
("build/mozconfig.common", ("build/mozconfig.common",
"MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}", "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}",
"MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}"), "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}"),
("build/mozconfig.common", ("build/mozconfig.common",
"# Enable enforcing that add-ons are signed by the trusted root", "# Enable enforcing that add-ons are signed by the trusted root",
"# Disable enforcing that add-ons are signed by the trusted root") "# Disable enforcing that add-ons are signed by the trusted root")
("build/mozconfig.common", ("build/mozconfig.common",
"MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}", "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}",
"MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}"), "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}"),
], ],
"vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'), "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'),
# "hg_share_base": None, # "hg_share_base": None,

Просмотреть файл

@ -1,34 +0,0 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-esr31.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/releases/mozilla-esr31",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "production",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/build/tools",
"branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"repo": "https://hg.mozilla.org/build/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
"required_config_vars": ["tag_override"],
"l10n_dir": "mozilla-esr31",
"merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}

Просмотреть файл

@ -1,34 +0,0 @@
{
"work_dir": ".",
"log_name": "multilocale",
"objdir": "obj-firefox",
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-esr31.json",
"locales_platform": "android-multilocale",
"locales_dir": "mobile/android/locales",
"ignore_locales": ["en-US", "multi"],
"repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/mozilla-esr31",
"branch": "default",
"dest": "build"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
},{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/tools",
"branch": "default",
"dest": "tools"
}],
"l10n_repos": [{
"repo": "https://hg.mozilla.org/%(user_repo_override)s/buildbot-configs",
"branch": "default",
"dest": "build/configs"
}],
"vcs_share_base": "/builds/hg-shared",
"hg_l10n_base": "https://hg.mozilla.org/users/stage-ffxbld",
"required_config_vars": ["tag_override", "user_repo_override"],
"l10n_dir": "mozilla-esr31",
"merge_locales": true,
"mozilla_dir": "build",
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
}

Просмотреть файл

@ -1,20 +0,0 @@
config = {
"log_name": "bump_esr38",
"version_files": [
{"file": "browser/config/version.txt"},
# TODO: enable this for esr45
# {"file": "browser/config/version_display.txt"},
{"file": "config/milestone.txt"},
],
"repo": {
"repo": "https://hg.mozilla.org/releases/mozilla-esr38",
"branch": "default",
"dest": "mozilla-esr38",
"vcs": "hg",
},
"vcs_share_base": "/builds/hg-shared",
"push_dest": "ssh://hg.mozilla.org/releases/mozilla-esr38",
"ignore_no_changes": True,
"ssh_user": "ffxbld",
"ssh_key": "~/.ssh/ffxbld_rsa",
}

Просмотреть файл

@ -1,18 +1,18 @@
config = { config = {
"log_name": "bump_esr45", "log_name": "bump_esr52",
"version_files": [ "version_files": [
{"file": "browser/config/version.txt"}, {"file": "browser/config/version.txt"},
{"file": "browser/config/version_display.txt"}, {"file": "browser/config/version_display.txt"},
{"file": "config/milestone.txt"}, {"file": "config/milestone.txt"},
], ],
"repo": { "repo": {
"repo": "https://hg.mozilla.org/releases/mozilla-esr45", "repo": "https://hg.mozilla.org/releases/mozilla-esr52",
"branch": "default", "branch": "default",
"dest": "mozilla-esr45", "dest": "mozilla-esr52",
"vcs": "hg", "vcs": "hg",
}, },
"vcs_share_base": "/builds/hg-shared", "vcs_share_base": "/builds/hg-shared",
"push_dest": "ssh://hg.mozilla.org/releases/mozilla-esr45", "push_dest": "ssh://hg.mozilla.org/releases/mozilla-esr52",
"ignore_no_changes": True, "ignore_no_changes": True,
"ssh_user": "ffxbld", "ssh_user": "ffxbld",
"ssh_key": "~/.ssh/ffxbld_rsa", "ssh_key": "~/.ssh/ffxbld_rsa",

Просмотреть файл

@ -1,6 +1,6 @@
config = { config = {
"log_name": "updates_esr45", "log_name": "updates_esr52",
"repo": { "repo": {
"repo": "https://hg.mozilla.org/build/tools", "repo": "https://hg.mozilla.org/build/tools",
"branch": "default", "branch": "default",
@ -9,7 +9,7 @@ config = {
}, },
"vcs_share_base": "/builds/hg-shared", "vcs_share_base": "/builds/hg-shared",
"push_dest": "ssh://hg.mozilla.org/build/tools", "push_dest": "ssh://hg.mozilla.org/build/tools",
"shipped-locales-url": "https://hg.mozilla.org/releases/mozilla-esr45/raw-file/{revision}/browser/locales/shipped-locales", "shipped-locales-url": "https://hg.mozilla.org/releases/mozilla-esr52/raw-file/{revision}/browser/locales/shipped-locales",
"ignore_no_changes": True, "ignore_no_changes": True,
"ssh_user": "ffxbld", "ssh_user": "ffxbld",
"ssh_key": "~/.ssh/ffxbld_rsa", "ssh_key": "~/.ssh/ffxbld_rsa",
@ -23,12 +23,12 @@ config = {
"esr": { "esr": {
"version_regex": r".*", "version_regex": r".*",
"requires_mirrors": True, "requires_mirrors": True,
"patcher_config": "mozEsr45-branch-patcher2.cfg", "patcher_config": "mozEsr52-branch-patcher2.cfg",
"update_verify_channel": "esr-localtest", "update_verify_channel": "esr-localtest",
"mar_channel_ids": [], "mar_channel_ids": [],
"channel_names": ["esr", "esr-localtest", "esr-cdntest"], "channel_names": ["esr", "esr-localtest", "esr-cdntest"],
"rules_to_update": ["esr45-cdntest", "esr45-localtest"], "rules_to_update": ["esr52-cdntest", "esr52-localtest"],
"publish_rules": ["esr45"], "publish_rules": ["esr52"],
}, },
}, },
"balrog_use_dummy_suffix": False, "balrog_use_dummy_suffix": False,

Просмотреть файл

@ -1,15 +1,14 @@
config = { config = {
"nightly_build": True, "nightly_build": True,
"branch": "mozilla-esr45", "branch": "mozilla-esr52",
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr45/", "en_us_binary_url": "https://archive.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr52/",
"update_channel": "esr", "update_channel": "esr",
"latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-esr45-l10n',
# l10n # l10n
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release", "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
# repositories # repositories
"mozilla_dir": "mozilla-esr45", "mozilla_dir": "mozilla-esr52",
"repos": [{ "repos": [{
"vcs": "hg", "vcs": "hg",
"repo": "https://hg.mozilla.org/build/tools", "repo": "https://hg.mozilla.org/build/tools",
@ -17,9 +16,9 @@ config = {
"dest": "tools", "dest": "tools",
}, { }, {
"vcs": "hg", "vcs": "hg",
"repo": "https://hg.mozilla.org/releases/mozilla-esr45", "repo": "https://hg.mozilla.org/releases/mozilla-esr52",
"revision": "%(revision)s", "revision": "%(revision)s",
"dest": "mozilla-esr45", "dest": "mozilla-esr52",
}], }],
# purge options # purge options
'purge_minsize': 12, 'purge_minsize': 12,