Bug 1337366 - Gecko-specific changes to support mozilla-esr52 r=jlund
authorRail Aliiev <rail@mozilla.com>
Tue, 07 Feb 2017 09:21:57 -0500
changeset 376158 50ab07065a83ad7555a9044a7860da28223ed4d1
parent 376157 006d94b8192c1a1ff9d3d9746a48c51f0a570a2b
child 376159 9849d98ca87741734806f9676c1a1c3e981a50ac
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1337366
milestone53.0a2
Bug 1337366 - Gecko-specific changes to support mozilla-esr52 r=jlund MozReview-Commit-ID: KrXbAPLEN2m
testing/mozharness/configs/merge_day/bump_esr.py
testing/mozharness/configs/merge_day/release_to_esr.py
testing/mozharness/configs/multi_locale/release_mozilla-esr_android-armv6.json
testing/mozharness/configs/multi_locale/staging_release_mozilla-esr_android-armv6.json
testing/mozharness/configs/releases/postrelease_esr38.py
testing/mozharness/configs/releases/postrelease_firefox_esr45.py
testing/mozharness/configs/releases/postrelease_firefox_esr52.py
testing/mozharness/configs/releases/updates_firefox_esr45.py
testing/mozharness/configs/releases/updates_firefox_esr52.py
testing/mozharness/configs/single_locale/mozilla-esr45.py
testing/mozharness/configs/single_locale/mozilla-esr52.py
--- a/testing/mozharness/configs/merge_day/bump_esr.py
+++ b/testing/mozharness/configs/merge_day/bump_esr.py
@@ -6,17 +6,17 @@ config = {
     "log_name": "bump_esr",
     "version_files": [
         {"file": "browser/config/version.txt", "suffix": ""},
         {"file": "browser/config/version_display.txt", "suffix": ""},
         {"file": "config/milestone.txt", "suffix": ""},
     ],
     "tools_repo_url": "https://hg.mozilla.org/build/tools",
     "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",
     "require_remove_locales": False,
     "requires_head_merge": False,
     "default_actions": [
         "clean-repos",
         "pull",
         "bump_second_digit"
--- a/testing/mozharness/configs/merge_day/release_to_esr.py
+++ b/testing/mozharness/configs/merge_day/release_to_esr.py
@@ -1,14 +1,14 @@
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
-NEW_ESR_REPO = "ssh://hg.mozilla.org/releases/mozilla-esr45"
-OLD_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr38"
-OLD_ESR_CHANGESET = "16351963d75c"
+NEW_ESR_REPO = "ssh://hg.mozilla.org/releases/mozilla-esr52"
+OLD_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr45"
+OLD_ESR_CHANGESET = "d2d75f526882"
 
 config = {
     "log_name": "relese_to_esr",
     "version_files": [
         {"file": "browser/config/version.txt", "suffix": ""},
         {"file": "browser/config/version_display.txt", "suffix": ""},
         {"file": "config/milestone.txt", "suffix": ""},
     ],
@@ -16,27 +16,27 @@ config = {
         # File, from, to
         ("browser/confvars.sh",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr"),
         ("browser/confvars.sh",
          "MAR_CHANNEL_ID=firefox-mozilla-release",
          "MAR_CHANNEL_ID=firefox-mozilla-esr"),
         ("build/mozconfig.common",
-          "# Enable checking that add-ons are signed by the trusted root",
-          "# Disable 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")
         ("build/mozconfig.common",
-          "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}",
-          "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}"),
+         "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}",
+         "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}"),
         ("build/mozconfig.common",
-           "# Enable enforcing that add-ons are signed by the trusted root",
-           "# Disable 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")
         ("build/mozconfig.common",
-          "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}",
-          "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}"),
+         "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}",
+         "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}"),
     ],
     "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'),
     # "hg_share_base": None,
     "tools_repo_url": "https://hg.mozilla.org/build/tools",
     "tools_repo_branch": "default",
     "from_repo_url": "ssh://hg.mozilla.org/releases/mozilla-release",
     "to_repo_url": NEW_ESR_REPO,
 
deleted file mode 100644
--- a/testing/mozharness/configs/multi_locale/release_mozilla-esr_android-armv6.json
+++ /dev/null
@@ -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"
-}
deleted file mode 100644
--- a/testing/mozharness/configs/multi_locale/staging_release_mozilla-esr_android-armv6.json
+++ /dev/null
@@ -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"
-}
deleted file mode 100644
--- a/testing/mozharness/configs/releases/postrelease_esr38.py
+++ /dev/null
@@ -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",
-}
rename from testing/mozharness/configs/releases/postrelease_firefox_esr45.py
rename to testing/mozharness/configs/releases/postrelease_firefox_esr52.py
--- a/testing/mozharness/configs/releases/postrelease_firefox_esr45.py
+++ b/testing/mozharness/configs/releases/postrelease_firefox_esr52.py
@@ -1,21 +1,21 @@
 config = {
-    "log_name": "bump_esr45",
+    "log_name": "bump_esr52",
     "version_files": [
         {"file": "browser/config/version.txt"},
         {"file": "browser/config/version_display.txt"},
         {"file": "config/milestone.txt"},
     ],
     "repo": {
-        "repo": "https://hg.mozilla.org/releases/mozilla-esr45",
+        "repo": "https://hg.mozilla.org/releases/mozilla-esr52",
         "branch": "default",
-        "dest": "mozilla-esr45",
+        "dest": "mozilla-esr52",
         "vcs": "hg",
     },
     "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,
     "ssh_user": "ffxbld",
     "ssh_key": "~/.ssh/ffxbld_rsa",
     "ship_it_root": "https://ship-it.mozilla.org",
     "ship_it_username":  "ffxbld",
 }
rename from testing/mozharness/configs/releases/updates_firefox_esr45.py
rename to testing/mozharness/configs/releases/updates_firefox_esr52.py
--- a/testing/mozharness/configs/releases/updates_firefox_esr45.py
+++ b/testing/mozharness/configs/releases/updates_firefox_esr52.py
@@ -1,35 +1,35 @@
 
 config = {
-    "log_name": "updates_esr45",
+    "log_name": "updates_esr52",
     "repo": {
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools",
         "vcs": "hg",
     },
     "vcs_share_base": "/builds/hg-shared",
     "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,
     "ssh_user": "ffxbld",
     "ssh_key": "~/.ssh/ffxbld_rsa",
     "archive_domain": "archive.mozilla.org",
     "archive_prefix": "https://archive.mozilla.org/pub",
     "previous_archive_prefix": "https://archive.mozilla.org/pub",
     "download_domain": "download.mozilla.org",
     "balrog_url": "https://aus5.mozilla.org",
     "balrog_username": "ffxbld",
     "update_channels": {
         "esr": {
             "version_regex": r".*",
             "requires_mirrors": True,
-            "patcher_config": "mozEsr45-branch-patcher2.cfg",
+            "patcher_config": "mozEsr52-branch-patcher2.cfg",
             "update_verify_channel": "esr-localtest",
             "mar_channel_ids": [],
             "channel_names": ["esr", "esr-localtest", "esr-cdntest"],
-            "rules_to_update": ["esr45-cdntest", "esr45-localtest"],
-            "publish_rules": ["esr45"],
+            "rules_to_update": ["esr52-cdntest", "esr52-localtest"],
+            "publish_rules": ["esr52"],
         },
     },
     "balrog_use_dummy_suffix": False,
 }
rename from testing/mozharness/configs/single_locale/mozilla-esr45.py
rename to testing/mozharness/configs/single_locale/mozilla-esr52.py
--- a/testing/mozharness/configs/single_locale/mozilla-esr45.py
+++ b/testing/mozharness/configs/single_locale/mozilla-esr52.py
@@ -1,30 +1,29 @@
 config = {
     "nightly_build": True,
-    "branch": "mozilla-esr45",
-    "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr45/",
+    "branch": "mozilla-esr52",
+    "en_us_binary_url": "https://archive.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr52/",
     "update_channel": "esr",
-    "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-esr45-l10n',
 
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
 
     # repositories
-    "mozilla_dir": "mozilla-esr45",
+    "mozilla_dir": "mozilla-esr52",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
         "branch": "default",
         "dest": "tools",
     }, {
         "vcs": "hg",
-        "repo": "https://hg.mozilla.org/releases/mozilla-esr45",
+        "repo": "https://hg.mozilla.org/releases/mozilla-esr52",
         "revision": "%(revision)s",
-        "dest": "mozilla-esr45",
+        "dest": "mozilla-esr52",
     }],
     # purge options
     'purge_minsize': 12,
     'is_automation': True,
     'default_actions': [
         "clobber",
         "pull",
         "clone-locales",