Bug 1116781 - Tracking bug for 12-Jan-2015 migration work. r=hwine
authorRail Aliiev <rail@mozilla.com>
Sun, 11 Jan 2015 13:08:50 -0500 (2015-01-11)
changeset 3536 90259d060b5081b72d7ad67dc69ba9bb2b7ac3fa
parent 3535 194cb626604ef218f7ae5de47ca732bc4c82c30c
child 3537 5fe2aaab2c6a5e4ac5951c21239ebd73c5213418
push id2755
push userraliiev@mozilla.com
push dateSun, 11 Jan 2015 18:08:56 +0000 (2015-01-11)
reviewershwine
bugs1116781
Bug 1116781 - Tracking bug for 12-Jan-2015 migration work. r=hwine * Update B2G branching exceptions * Add mozilla-b2g34_v2_1s to the list of repos to be tagged by merge day automation
configs/merge_day/b2g_branch_repos.py
configs/merge_day/b2g_tag.py
--- a/configs/merge_day/b2g_branch_repos.py
+++ b/configs/merge_day/b2g_branch_repos.py
@@ -8,16 +8,20 @@ config = {
     "manifest_repo_revision": "master",
     "tools_repo_url": "https://hg.mozilla.org/build/tools",
     "tools_repo_revision": "default",
     "branch_remote_substrings": [
         'github.com/mozilla',
     ],
     "no_branch_repos": [
         "gecko",
+        # device conflict
+        "platform_frameworks_base",
+        "device_lge_hammerhead-kernel",
+        "device-hammerhead",
     ],
     "extra_branch_manifest_repos": [
         "gecko",
         "gaia",
     ],
     "branch_order": [
         "master",
         "b2g-4.3_r2.1",   # prefer jellybean over kitkat for now, since
--- a/configs/merge_day/b2g_tag.py
+++ b/configs/merge_day/b2g_tag.py
@@ -6,16 +6,20 @@ LIVE_B2G_BRANCHES = {
     "mozilla-b2g32_v2_0": {
         "gaia_branch": "v2.0",
         "tag_name": "B2G_2_0_%(DATE)s_MERGEDAY",
     },
     "mozilla-b2g34_v2_1": {
         "gaia_branch": "v2.1",
         "tag_name": "B2G_2_1_%(DATE)s_MERGEDAY",
     },
+    "mozilla-b2g34_v2_1s": {
+        "gaia_branch": "v2.1s",
+        "tag_name": "B2G_2_1s_%(DATE)s_MERGEDAY",
+    },
 }
 
 config = {
     "log_name": "b2g_tag",
 
     "gaia_mapper_base_url": "http://cruncher/mapper/gaia/git",
     "gaia_url": "git@github.com:mozilla-b2g/gaia.git",
     "hg_base_pull_url": "https://hg.mozilla.org/releases",