Bug 1186284 - Remove automation for the mozilla-b2g32_v2_0 branch. r=catlee
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 23 Jul 2015 16:21:21 -0400
changeset 222180 2a906f635dfd
parent 222179 1a68d62f470d
child 222181 41e10c6740be
push id561
push userryanvm@gmail.com
push dateThu, 23 Jul 2015 20:30:01 +0000
treeherdermozilla-b2g34_v2_1@41e10c6740be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee
bugs1186284
milestone34.0
Bug 1186284 - Remove automation for the mozilla-b2g32_v2_0 branch. r=catlee
testing/mozharness/configs/b2g/releng-emulator.py
testing/mozharness/configs/b2g/releng-fota-eng.py
testing/mozharness/configs/b2g/releng-fota-updates.py
testing/mozharness/configs/b2g/releng-otoro-eng.py
testing/mozharness/configs/b2g/releng-otoro.py
testing/mozharness/configs/b2g/releng-private-updates.py
testing/mozharness/configs/b2g_bumper/v1.4.py
testing/mozharness/configs/b2g_bumper/v2.0.py
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/merge_day/b2g_tag.py
testing/mozharness/configs/vcs_sync/gecko-git.py
--- a/testing/mozharness/configs/b2g/releng-emulator.py
+++ b/testing/mozharness/configs/b2g/releng-emulator.py
@@ -45,21 +45,19 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g30_v1_4': '1.4.0',
-            'mozilla-b2g32_v2_0': '2.0.0',
             'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
-            'mozilla-central': '3.0.0',
+            'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",
         "CCACHE_COMPRESS": "1",
         "CCACHE_UMASK": "002",
--- a/testing/mozharness/configs/b2g/releng-fota-eng.py
+++ b/testing/mozharness/configs/b2g/releng-fota-eng.py
@@ -44,21 +44,19 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g30_v1_4': '1.4.0',
-            'mozilla-b2g32_v2_0': '2.0.0',
             'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
-            'mozilla-central': '3.0.0',
+            'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
         "target_suffix": "-eng",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",
         "CCACHE_COMPRESS": "1",
--- a/testing/mozharness/configs/b2g/releng-fota-updates.py
+++ b/testing/mozharness/configs/b2g/releng-fota-updates.py
@@ -44,21 +44,19 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g30_v1_4': '1.4.0',
-            'mozilla-b2g32_v2_0': '2.0.0',
             'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
-            'mozilla-central': '3.0.0',
+            'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",
         "CCACHE_COMPRESS": "1",
         "CCACHE_UMASK": "002",
--- a/testing/mozharness/configs/b2g/releng-otoro-eng.py
+++ b/testing/mozharness/configs/b2g/releng-otoro-eng.py
@@ -44,21 +44,19 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g30_v1_4': '1.4.0',
-            'mozilla-b2g32_v2_0': '2.0.0',
             'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
-            'mozilla-central': '3.0.0',
+            'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
         "target_suffix": "-eng",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",
         "CCACHE_COMPRESS": "1",
--- a/testing/mozharness/configs/b2g/releng-otoro.py
+++ b/testing/mozharness/configs/b2g/releng-otoro.py
@@ -43,21 +43,19 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g30_v1_4': '1.4.0',
-            'mozilla-b2g32_v2_0': '2.0.0',
             'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
-            'mozilla-central': '3.0.0',
+            'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",
         "CCACHE_COMPRESS": "1",
         "CCACHE_UMASK": "002",
--- a/testing/mozharness/configs/b2g/releng-private-updates.py
+++ b/testing/mozharness/configs/b2g/releng-private-updates.py
@@ -44,21 +44,19 @@ config = {
     },
     "manifest": {
         "upload_remote_host": "stage.mozilla.org",
         "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/nightly/%(version)s",
         "depend_upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/depend/%(branch)s/%(platform)s/%(buildid)s",
         "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
         "ssh_user": "b2gbld",
         "branches": {
-            'mozilla-b2g30_v1_4': '1.4.0',
-            'mozilla-b2g32_v2_0': '2.0.0',
             'mozilla-b2g34_v2_1': '2.1.0',
             'mozilla-b2g37_v2_2': '2.2.0',
-            'mozilla-central': '3.0.0',
+            'mozilla-central': '2.5.0',
         },
         "translate_hg_to_git": True,
         "translate_base_url": "http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}",
     },
     "env": {
         "CCACHE_DIR": "/builds/ccache",
         "CCACHE_COMPRESS": "1",
         "CCACHE_UMASK": "002",
deleted file mode 100644
--- a/testing/mozharness/configs/b2g_bumper/v1.4.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-config = {
-    "exes": {
-        # Get around the https warnings
-        "hg": ['/usr/local/bin/hg', "--config", "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt"],
-        "hgtool.py": ["/usr/local/bin/hgtool.py"],
-        "gittool.py": ["/usr/local/bin/gittool.py"],
-    },
-    'gecko_pull_url': 'https://hg.mozilla.org/releases/mozilla-b2g30_v1_4',
-    'gecko_push_url': 'ssh://hg.mozilla.org/releases/mozilla-b2g30_v1_4',
-    'gecko_local_dir': 'mozilla-b2g30_v1_4',
-    'git_ref_cache': '/builds/b2g_bumper/git_ref_cache.json',
-
-    'manifests_repo': 'https://git.mozilla.org/b2g/b2g-manifest.git',
-    'manifests_revision': 'origin/v1.4',
-
-    'hg_user': 'B2G Bumper Bot <release+b2gbumper@mozilla.com>',
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "ssh_user": "ffxbld",
-
-    'hgtool_base_bundle_urls': ['https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles'],
-
-    'gaia_repo_url': 'https://hg.mozilla.org/integration/gaia-1_4',
-    'gaia_revision_file': 'b2g/config/gaia.json',
-    'gaia_max_revisions': 5,
-    # Which git branch this hg repo corresponds to
-    'gaia_git_branch': 'v1.4',
-    'gaia_git_repo': 'https://git.mozilla.org/releases/gaia.git',
-    'gaia_mapper_project': 'gaia',
-    'mapper_url': 'http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}',
-
-    'devices': {
-        'dolphin': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-kk': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-jb': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-ics': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-            'manifest_file': 'emulator.xml',
-        },
-        # Equivalent to emulator-ics - see bug 916134
-        # Remove once the above bug resolved
-        'emulator': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-            'manifest_file': 'emulator.xml',
-        },
-        'flame': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'nexus-4': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-    },
-    'repo_remote_mappings': {
-        'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
-        'git://codeaurora.org/': 'https://git.mozilla.org/external/caf',
-        'git://github.com/mozilla-b2g/': 'https://git.mozilla.org/b2g',
-        'git://github.com/mozilla/': 'https://git.mozilla.org/b2g',
-        'https://git.mozilla.org/releases': 'https://git.mozilla.org/releases',
-        'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
-        'http://sprdsource.spreadtrum.com:8085/b2g/android': 'https://git.mozilla.org/external/sprd-aosp',
-        'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
-        'git://github.com/t2m-foxfone/': 'https://git.mozilla.org/external/t2m-foxfone',
-        # Some mappings to ourself, we want to leave these as-is!
-        'https://git.mozilla.org/external/aosp': 'https://git.mozilla.org/external/aosp',
-        'https://git.mozilla.org/external/caf': 'https://git.mozilla.org/external/caf',
-        'https://git.mozilla.org/b2g': 'https://git.mozilla.org/b2g',
-        'https://git.mozilla.org/external/apitrace': 'https://git.mozilla.org/external/apitrace',
-        'https://git.mozilla.org/external/t2m-foxfone': 'https://git.mozilla.org/external/t2m-foxfone',
-    },
-}
deleted file mode 100644
--- a/testing/mozharness/configs/b2g_bumper/v2.0.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-config = {
-    "exes": {
-        # Get around the https warnings
-        "hg": ['/usr/local/bin/hg', "--config", "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt"],
-        "hgtool.py": ["/usr/local/bin/hgtool.py"],
-        "gittool.py": ["/usr/local/bin/gittool.py"],
-    },
-    'gecko_pull_url': 'https://hg.mozilla.org/releases/mozilla-b2g32_v2_0',
-    'gecko_push_url': 'ssh://hg.mozilla.org/releases/mozilla-b2g32_v2_0',
-    'gecko_local_dir': 'mozilla-b2g32_v2_0',
-    'git_ref_cache': '/builds/b2g_bumper/git_ref_cache.json',
-
-    'manifests_repo': 'https://git.mozilla.org/b2g/b2g-manifest.git',
-    'manifests_revision': 'origin/v2.0',
-
-    'hg_user': 'B2G Bumper Bot <release+b2gbumper@mozilla.com>',
-    "ssh_key": "~/.ssh/ffxbld_rsa",
-    "ssh_user": "ffxbld",
-
-    'hgtool_base_bundle_urls': ['https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles'],
-
-    'gaia_repo_url': 'https://hg.mozilla.org/integration/gaia-2_0',
-    'gaia_revision_file': 'b2g/config/gaia.json',
-    'gaia_max_revisions': 5,
-    # Which git branch this hg repo corresponds to
-    'gaia_git_branch': 'v2.0',
-    'gaia_git_repo': 'https://git.mozilla.org/releases/gaia.git',
-    'gaia_mapper_project': 'gaia',
-    'mapper_url': 'http://cruncher.build.mozilla.org/mapper/{project}/{vcs}/{rev}',
-
-    'devices': {
-        'emulator-kk': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-jb': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'emulator-ics': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-            'manifest_file': 'emulator.xml',
-        },
-        # Equivalent to emulator-ics - see bug 916134
-        # Remove once the above bug resolved
-        'emulator': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-            'manifest_file': 'emulator.xml',
-        },
-        'flame': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'flame-kk': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-        'nexus-4': {
-            'ignore_projects': ['gecko'],
-            'ignore_groups': ['darwin'],
-        },
-    },
-    'repo_remote_mappings': {
-        'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
-        'git://codeaurora.org/': 'https://git.mozilla.org/external/caf',
-        'git://github.com/mozilla-b2g/': 'https://git.mozilla.org/b2g',
-        'git://github.com/mozilla/': 'https://git.mozilla.org/b2g',
-        'https://git.mozilla.org/releases': 'https://git.mozilla.org/releases',
-        'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
-        'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
-        'git://github.com/t2m-foxfone/': 'https://git.mozilla.org/external/t2m-foxfone',
-        # Some mappings to ourself, we want to leave these as-is!
-        'https://git.mozilla.org/external/aosp': 'https://git.mozilla.org/external/aosp',
-        'https://git.mozilla.org/external/caf': 'https://git.mozilla.org/external/caf',
-        'https://git.mozilla.org/b2g': 'https://git.mozilla.org/b2g',
-        'https://git.mozilla.org/external/apitrace': 'https://git.mozilla.org/external/apitrace',
-        'https://git.mozilla.org/external/t2m-foxfone': 'https://git.mozilla.org/external/t2m-foxfone',
-    },
-}
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -59,28 +59,16 @@ config = {
         'use_branch_in_symbols_extra_buildid': False,
     },
     'mozilla-esr31': {
         'repo_path': 'releases/mozilla-esr31',
         'update_channel': 'nightly-esr31',
         'branch_uses_per_checkin_strategy': True,
         'use_branch_in_symbols_extra_buildid': False,
     },
-    'mozilla-b2g30_v1_4': {
-        'repo_path': 'releases/mozilla-b2g30_v1_4',
-        'use_branch_in_symbols_extra_buildid': False,
-        'update_channel': 'nightly-b2g30',
-        'graph_server_branch_name': 'Mozilla-B2g30-v1.4',
-    },
-    'mozilla-b2g32_v2_0': {
-        'repo_path': 'releases/mozilla-b2g32_v2_0',
-        'use_branch_in_symbols_extra_buildid': False,
-        'update_channel': 'nightly-b2g32',
-        'graph_server_branch_name': 'Mozilla-B2g32-v2.0',
-    },
     'try': {
         'repo_path': 'try',
         'clone_by_revision': True,
         'clone_with_purge': True,
         'tinderbox_build_dir': '%(who)s-%(got_revision)s',
         'to_tinderbox_dated': False,
         'include_post_upload_builddir': True,
         'release_to_try_builds': True,
--- a/testing/mozharness/configs/merge_day/b2g_tag.py
+++ b/testing/mozharness/configs/merge_day/b2g_tag.py
@@ -1,29 +1,25 @@
 LIVE_B2G_BRANCHES = {
-    "mozilla-b2g30_v1_4": {
-        "gaia_branch": "v1.4",
-        "tag_name": "B2G_1_4_%(DATE)s_MERGEDAY",
-    },
-    "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",
     },
     "mozilla-b2g37_v2_2": {
         "gaia_branch": "v2.2",
         "tag_name": "B2G_2_2_%(DATE)s_MERGEDAY",
     },
+    "mozilla-b2g37_v2_2r": {
+        "gaia_branch": "v2.2r",
+        "tag_name": "B2G_2_2r_%(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",
--- a/testing/mozharness/configs/vcs_sync/gecko-git.py
+++ b/testing/mozharness/configs/vcs_sync/gecko-git.py
@@ -65,16 +65,38 @@ config = {
             },
         },
         "tag_config": {
             "tag_regexes": [
                 "^B2G_",
             ],
         },
     }, {
+        "repo": "https://hg.mozilla.org/releases/mozilla-b2g37_v2_2r",
+        "revision": "default",
+        "repo_name": "mozilla-b2g37_v2_2r",
+        "targets": [{
+            "target_dest": "gecko-git/.git",
+            "vcs": "git",
+            "test_push": True,
+        }, {
+            "target_dest": "github-gecko-git",
+        }],
+        "vcs": "hg",
+        "branch_config": {
+            "branches": {
+                "default": "v2.2r",
+            },
+        },
+        "tag_config": {
+            "tag_regexes": [
+                "^B2G_",
+            ],
+        },
+    }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-b2g34_v2_1",
         "revision": "default",
         "repo_name": "mozilla-b2g34_v2_1",
         "targets": [{
             "target_dest": "gecko-git/.git",
             "vcs": "git",
             "test_push": True,
         }, {
@@ -87,16 +109,38 @@ config = {
             },
         },
         "tag_config": {
             "tag_regexes": [
                 "^B2G_",
             ],
         },
     }, {
+        "repo": "https://hg.mozilla.org/releases/mozilla-b2g34_v2_1s",
+        "revision": "default",
+        "repo_name": "mozilla-b2g34_v2_1s",
+        "targets": [{
+            "target_dest": "gecko-git/.git",
+            "vcs": "git",
+            "test_push": True,
+        }, {
+            "target_dest": "github-gecko-git",
+        }],
+        "vcs": "hg",
+        "branch_config": {
+            "branches": {
+                "default": "v2.1s",
+            },
+        },
+        "tag_config": {
+            "tag_regexes": [
+                "^B2G_",
+            ],
+        },
+    }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-b2g32_v2_0",
         "revision": "default",
         "repo_name": "mozilla-b2g32_v2_0",
         "targets": [{
             "target_dest": "gecko-git/.git",
             "vcs": "git",
             "test_push": True,
         }, {
@@ -109,16 +153,38 @@ config = {
             },
         },
         "tag_config": {
             "tag_regexes": [
                 "^B2G_",
             ],
         },
     }, {
+        "repo": "https://hg.mozilla.org/releases/mozilla-b2g32_v2_0m",
+        "revision": "default",
+        "repo_name": "mozilla-b2g32_v2_0m",
+        "targets": [{
+            "target_dest": "gecko-git/.git",
+            "vcs": "git",
+            "test_push": True,
+        }, {
+            "target_dest": "github-gecko-git",
+        }],
+        "vcs": "hg",
+        "branch_config": {
+            "branches": {
+                "default": "v2.0m",
+            },
+        },
+        "tag_config": {
+            "tag_regexes": [
+                "^B2G_",
+            ],
+        },
+    }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-b2g30_v1_4",
         "revision": "default",
         "repo_name": "mozilla-b2g30_v1_4",
         "targets": [{
             "target_dest": "gecko-git/.git",
             "vcs": "git",
             "test_push": True,
         }, {
@@ -153,16 +219,38 @@ config = {
             },
         },
         "tag_config": {
             "tag_regexes": [
                 "^B2G_",
             ],
         },
     }, {
+        "repo": "https://hg.mozilla.org/releases/mozilla-b2g28_v1_3t",
+        "revision": "default",
+        "repo_name": "mozilla-b2g28_v1_3t",
+        "targets": [{
+            "target_dest": "gecko-git/.git",
+            "vcs": "git",
+            "test_push": True,
+        }, {
+            "target_dest": "github-gecko-git",
+        }],
+        "vcs": "hg",
+        "branch_config": {
+            "branches": {
+                "default": "v1.3t",
+            },
+        },
+        "tag_config": {
+            "tag_regexes": [
+                "^B2G_",
+            ],
+        },
+    }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-b2g26_v1_2",
         "revision": "default",
         "repo_name": "mozilla-b2g26_v1_2",
         "targets": [{
             "target_dest": "gecko-git/.git",
             "vcs": "git",
             "test_push": True,
         }, {
@@ -197,60 +285,16 @@ config = {
             },
         },
         "tag_config": {
             "tag_regexes": [
                 "^B2G_",
             ],
         },
     }, {
-        "repo": "https://hg.mozilla.org/releases/mozilla-b2g28_v1_3t",
-        "revision": "default",
-        "repo_name": "mozilla-b2g28_v1_3t",
-        "targets": [{
-            "target_dest": "gecko-git/.git",
-            "vcs": "git",
-            "test_push": True,
-        }, {
-            "target_dest": "github-gecko-git",
-        }],
-        "vcs": "hg",
-        "branch_config": {
-            "branches": {
-                "default": "v1.3t",
-            },
-        },
-        "tag_config": {
-            "tag_regexes": [
-                "^B2G_",
-            ],
-        },
-    }, {
-        "repo": "https://hg.mozilla.org/releases/mozilla-b2g30_v1_4",
-        "revision": "default",
-        "repo_name": "mozilla-b2g30_v1_4",
-        "targets": [{
-            "target_dest": "gecko-git/.git",
-            "vcs": "git",
-            "test_push": True,
-        }, {
-            "target_dest": "github-gecko-git",
-        }],
-        "vcs": "hg",
-        "branch_config": {
-            "branches": {
-                "default": "v1.4",
-            },
-        },
-        "tag_config": {
-            "tag_regexes": [
-                "^B2G_",
-            ],
-        },
-    }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-b2g18",
         "revision": "default",
         "repo_name": "mozilla-b2g18",
         "targets": [{
             "target_dest": "gecko-git/.git",
             "vcs": "git",
             "test_push": True,
         }, {