Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to inbound. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2015-07-23 09:01:27 -04:00
commit e2981f9517
10 changed files with 98 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/mozharness/configs/b2g/releng-emulator.py
View File

@ -49,10 +49,9 @@ config = {
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
"ssh_user": "b2gbld",
"branches": {
'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}",

3
testing/mozharness/configs/b2g/releng-fota-eng.py
View File

@ -48,10 +48,9 @@ config = {
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
"ssh_user": "b2gbld",
"branches": {
'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}",

3
testing/mozharness/configs/b2g/releng-fota-updates.py
View File

@ -48,10 +48,9 @@ config = {
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
"ssh_user": "b2gbld",
"branches": {
'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}",

3
testing/mozharness/configs/b2g/releng-otoro-eng.py
View File

@ -48,10 +48,9 @@ config = {
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
"ssh_user": "b2gbld",
"branches": {
'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}",

3
testing/mozharness/configs/b2g/releng-otoro.py
View File

@ -47,10 +47,9 @@ config = {
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
"ssh_user": "b2gbld",
"branches": {
'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}",

3
testing/mozharness/configs/b2g/releng-private-updates.py
View File

@ -48,10 +48,9 @@ config = {
"ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
"ssh_user": "b2gbld",
"branches": {
'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}",

78
testing/mozharness/configs/b2g_bumper/v2.0.py
View File

@ -1,78 +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-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',
},
}

6
testing/mozharness/configs/builds/branch_specifics.py
View File

@ -64,12 +64,6 @@ config = {
'branch_uses_per_checkin_strategy': True,
'use_branch_in_symbols_extra_buildid': False,
},
'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,

8
testing/mozharness/configs/merge_day/b2g_tag.py
View File

@ -1,8 +1,4 @@
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",
@ -15,6 +11,10 @@ LIVE_B2G_BRANCHES = {
"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 = {

132
testing/mozharness/configs/vcs_sync/gecko-git.py
View File

@ -68,6 +68,28 @@ config = {
"^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",
@ -90,6 +112,28 @@ config = {
"^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",
@ -112,6 +156,28 @@ config = {
"^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",
@ -156,6 +222,28 @@ config = {
"^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",
@ -200,50 +288,6 @@ config = {
"^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",