--- a/configs/b2g/releng-emulator.py
+++ b/configs/b2g/releng-emulator.py
@@ -44,17 +44,16 @@ 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-b2g37_v2_2': '2.2.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",--- a/configs/b2g/releng-fota-eng.py
+++ b/configs/b2g/releng-fota-eng.py
@@ -43,17 +43,16 @@ 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-b2g37_v2_2': '2.2.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",--- a/configs/b2g/releng-fota-updates.py
+++ b/configs/b2g/releng-fota-updates.py
@@ -43,17 +43,16 @@ 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-b2g37_v2_2': '2.2.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",--- a/configs/b2g/releng-otoro-eng.py
+++ b/configs/b2g/releng-otoro-eng.py
@@ -43,17 +43,16 @@ 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-b2g37_v2_2': '2.2.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",--- a/configs/b2g/releng-otoro.py
+++ b/configs/b2g/releng-otoro.py
@@ -42,17 +42,16 @@ 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-b2g37_v2_2': '2.2.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",--- a/configs/b2g/releng-private-updates.py
+++ b/configs/b2g/releng-private-updates.py
@@ -43,17 +43,16 @@ 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-b2g37_v2_2': '2.2.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",deleted file mode 100644
--- a/configs/b2g_bumper/v2.2.py
+++ /dev/null
@@ -1,91 +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-b2g37_v2_2/',
- 'gecko_push_url': 'ssh://hg.mozilla.org/releases/mozilla-b2g37_v2_2/',
- 'gecko_local_dir': 'mozilla-b2g37_v2_2',
- 'git_ref_cache': '/builds/b2g_bumper/git_ref_cache.json',
-
- 'manifests_repo': 'https://git.mozilla.org/b2g/b2g-manifest.git',
- 'manifests_revision': 'origin/v2.2',
-
- '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_2',
- 'gaia_revision_file': 'b2g/config/gaia.json',
- 'gaia_max_revisions': 5,
- # Which git branch this hg repo corresponds to
- 'gaia_git_branch': 'v2.2',
- '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-l': {
- '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-kk': {
- 'ignore_projects': ['gecko'],
- 'ignore_groups': ['darwin'],
- },
- 'nexus-4': {
- 'ignore_projects': ['gecko'],
- 'ignore_groups': ['darwin'],
- },
- 'nexus-5-l': {
- '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',
- },
-}--- a/configs/luciddream/linux_config.py
+++ b/configs/luciddream/linux_config.py
@@ -7,17 +7,16 @@ HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
else:
xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
config = {
# mozharness script options
"xre_url": xre_url,
- "b2gdesktop_url": "http://ftp.mozilla.org/pub/mozilla.org/b2g/nightly/2015/03/2015-03-09-00-25-06-mozilla-b2g37_v2_2/b2g-37.0.multi.linux-i686.tar.bz2",
# mozharness configuration
"vcs_share_base": HG_SHARE_BASE_DIR,
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
'gittool.py': '%(abs_tools_dir)s/buildfarm/utils/gittool.py',--- a/configs/merge_day/b2g_tag.py
+++ b/configs/merge_day/b2g_tag.py
@@ -1,14 +1,9 @@
-LIVE_B2G_BRANCHES = {
- "mozilla-b2g37_v2_2": {
- "gaia_branch": "v2.2",
- "tag_name": "B2G_2_2_%(DATE)s_MERGEDAY",
- },
-}
+LIVE_B2G_BRANCHES = {}
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",
"hg_base_push_url": "ssh://hg.mozilla.org/releases",--- a/configs/vcs_sync/beagle.py
+++ b/configs/vcs_sync/beagle.py
@@ -297,73 +297,17 @@ config = {
"tag_regexes": [
"^B2G_",
],
},
"mapper": {
"url": "https://api.pub.build.mozilla.org/mapper",
"project": "gecko-dev"
},
- }, {
- "repo": "https://hg.mozilla.org/releases/mozilla-b2g37_v2_2",
- "revision": "default",
- "repo_name": "mozilla-b2g37_v2_2",
- "targets": [{
- "target_dest": "beagle/.git",
- "vcs": "git",
- "test_push": True,
- }, {
- "target_dest": "gitmo-beagle",
- }, {
- "target_dest": "github-beagle",
- }],
- "vcs": "hg",
- "branch_config": {
- "branches": {
- "default": "b2g37_v2_2",
- },
- },
- "tag_config": {
- "tag_regexes": [
- "^B2G_",
- ],
- },
- "mapper": {
- "url": "https://api.pub.build.mozilla.org/mapper",
- "project": "gecko-dev"
- },
- }, {
- "repo": "https://hg.mozilla.org/releases/mozilla-b2g37_v2_2r",
- "revision": "default",
- "repo_name": "mozilla-b2g37_v2_2r",
- "targets": [{
- "target_dest": "beagle/.git",
- "vcs": "git",
- "test_push": True,
- }, {
- "target_dest": "gitmo-beagle",
- }, {
- "target_dest": "github-beagle",
- }],
- "vcs": "hg",
- "branch_config": {
- "branches": {
- "default": "b2g37_v2_2r",
- },
- },
- "tag_config": {
- "tag_regexes": [
- "^B2G_",
- ],
- },
- "mapper": {
- "url": "https://api.pub.build.mozilla.org/mapper",
- "project": "gecko-dev"
- },
- }, {
+ }, {
"repo": "https://hg.mozilla.org/releases/b2g-ota",
"revision": "default",
"repo_name": "b2g-ota",
"targets": [{
"target_dest": "beagle/.git",
"vcs": "git",
"test_push": True,
}, {--- a/configs/vcs_sync/gecko-git.py
+++ b/configs/vcs_sync/gecko-git.py
@@ -42,60 +42,16 @@ config = {
},
"backup_dir": "/mnt/netapp/github_sync/aki/%s" % hostname,
"cvs_manifest": CVS_MANIFEST,
"cvs_history_tarball": "/home/pmoore/mozilla-cvs-history.tar.bz2",
"env": {
"PATH": "%(PATH)s:/usr/libexec/git-core",
},
"conversion_repos": [{
- "repo": "https://hg.mozilla.org/releases/mozilla-b2g37_v2_2",
- "revision": "default",
- "repo_name": "mozilla-b2g37_v2_2",
- "targets": [{
- "target_dest": "gecko-git/.git",
- "vcs": "git",
- "test_push": True,
- }, {
- "target_dest": "github-gecko-git",
- }],
- "vcs": "hg",
- "branch_config": {
- "branches": {
- "default": "v2.2",
- },
- },
- "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-b2g44_v2_5",
"revision": "default",
"repo_name": "mozilla-b2g44_v2_5",
"targets": [{
"target_dest": "gecko-git/.git",
"vcs": "git",
"test_push": True,
}, {