Merge default->production
$ hg merge -P -r default
changeset: 1973:67d0c83ee405
parent: 1970:e2e19076b0d0
user: Aki Sasaki <asasaki@mozilla.com>
date: Thu Oct 10 13:53:20 2013 -0700
summary:
bug 847727 - mozharness.base.* changes for beagle. r=rail
changeset: 1975:b4cabe359fad
parent: 1973:67d0c83ee405
user: Geoff Brown <gbrown@mozilla.com>
date: Fri Oct 11 13:45:42 2013 -0600
summary:
Bug 917543 - Use robocop.ini on x86 also; r=armenzg
changeset: 1976:b378d511e8a9
user: Mihai Tabara <mtabara@mozilla.com>
date: Fri Oct 11 18:27:08 2013 -0400
summary:
Bug 749421 - Allow test slaves to save and upload files somewhere, even from try. r=rail
changeset: 1977:5b178e665fa0
user: Aki Sasaki <asasaki@mozilla.com>
date: Sat Oct 12 14:42:24 2013 -0700
summary:
bug 847727 - clean up scripts/. r=rail
changeset: 1978:cd8ea7755bb4
user: Aki Sasaki <asasaki@mozilla.com>
date: Sat Oct 12 14:42:28 2013 -0700
summary:
bug 847727 - vcs_sync multi repo support. r=rail
changeset: 1979:31039070573c
user: Peter Moore <pmoore@mozilla.com>
date: Mon Oct 14 12:17:51 2013 +0200
summary:
Bug 925753: Upgrade mozharness to use new Panda image (containing Watcher 1.16),r=Callek,r=kmoir
changeset: 1980:78369f5c15ec
tag: tip
user: Dustin J. Mitchell <dustin@mozilla.com>
date: Mon Oct 14 07:50:31 2013 -0400
summary:
Bug 912970: Look to pypi.{pvt,pub}.build.mozilla.org for Python packages; r=aki
from copy import deepcopy
import os
import socket
hostname = socket.gethostname()
GECKO_BRANCHES = {
'v1.1': 'mozilla-beta',
'v1.2': 'mozilla-aurora',
'v1.3': 'mozilla-central',
}
GECKO_CONFIG_TEMPLATE = {
'mozilla-release': {
'locales_file_url': 'http://hg.mozilla.org/releases/mozilla-release/raw-file/default/b2g/locales/all-locales',
'hg_url': 'http://hg.mozilla.org/releases/l10n/mozilla-release/%(locale)s',
'targets': [{
"target_dest": "gitmo-gecko-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
'mozilla-beta': {
'locales_file_url': 'http://hg.mozilla.org/releases/mozilla-beta/raw-file/default/b2g/locales/all-locales',
'hg_url': 'http://hg.mozilla.org/releases/l10n/mozilla-beta/%(locale)s',
'targets': [{
"target_dest": "gitmo-gecko-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
'mozilla-aurora': {
'locales_file_url': 'http://hg.mozilla.org/releases/mozilla-aurora/raw-file/default/b2g/locales/all-locales',
'hg_url': 'http://hg.mozilla.org/releases/l10n/mozilla-aurora/%(locale)s',
'targets': [{
"target_dest": "gitmo-gecko-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
'mozilla-central': {
'locales_file_url': 'http://hg.mozilla.org/mozilla-central/raw-file/default/b2g/locales/all-locales',
'hg_url': 'http://hg.mozilla.org/l10n-central/%(locale)s',
'targets': [{
"target_dest": "gitmo-gecko-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
}
# Build gecko_config
GECKO_CONFIG = {}
for version, branch in GECKO_BRANCHES.items():
GECKO_CONFIG[branch] = deepcopy(GECKO_CONFIG_TEMPLATE[branch])
GECKO_CONFIG[branch]['git_branch_name'] = version
config = {
"log_name": "l10n",
"log_max_rotate": 99,
"job_name": "l10n",
"env": {
"PATH": "%(PATH)s:/usr/libexec/git-core",
},
"exes": {
# bug 828140 - shut https warnings up.
# http://kiln.stackexchange.com/questions/2816/mercurial-certificate-warning-certificate-not-verified-web-cacerts
"hg": [os.path.join(os.getcwd(), "build", "venv", "bin", "hg"), "--config", "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt"],
},
"conversion_type": "b2g-l10n",
"l10n_config": {
"gecko_config": GECKO_CONFIG,
"gaia_config": {
'v1_2': {
'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/v1.2/locales/languages_dev.json',
'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v1_2/%(locale)s',
'git_branch_name': 'v1.2',
'targets': [{
"target_dest": "gitmo-gaia-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
'v1-train': {
'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/v1-train/locales/languages_dev.json',
'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v1_1/%(locale)s',
'git_branch_name': 'v1.1',
'targets': [{
"target_dest": "gitmo-gaia-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
'v1_0_1': {
'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/v1.0.1/locales/languages_dev.json',
'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v1_0_1/%(locale)s',
'git_branch_name': 'v1.0.1',
'targets': [{
"target_dest": "gitmo-gaia-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
'master': {
'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/master/locales/languages_dev.json',
'hg_url': 'https://hg.mozilla.org/gaia-l10n/%(locale)s',
'git_branch_name': 'master',
'targets': [{
"target_dest": "gitmo-gaia-l10n",
}],
'tag_config': {
'tag_regexes': [
'^B2G_',
],
},
},
},
},
"remote_targets": {
"gitmo-gecko-l10n": {
"repo": 'git+ssh://git.mozilla.org/releases/l10n/%(locale)s/gecko.git',
"ssh_key": "~/.ssh/blah",
"vcs": "git",
},
"gitmo-gaia-l10n": {
"repo": 'git+ssh://git.mozilla.org/releases/l10n/%(locale)s/gaia.git',
"ssh_key": "~/.ssh/blah",
"vcs": "git",
},
},
"virtualenv_modules": [
"bottle==0.11.6",
"dulwich==0.9.0",
"ordereddict==1.1",
"hg-git==0.4.0-moz2",
"mapper==0.1",
"mercurial==2.6.3",
"mozfile==0.9",
"mozinfo==0.5",
"mozprocess==0.11",
],
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"upload_config": [{
"ssh_key": "~/.ssh/id_rsa",
"ssh_user": "asasaki",
"remote_host": "github-sync2",
"remote_path": "/home/asasaki/upload/l10n",
}],
"default_notify_from": "vcs2vcs@%s" % hostname,
"notify_config": [{
"to": "aki@mozilla.com",
"failure_only": False,
"skip_empty_messages": True,
}],
# Disallow sharing. We may need a better way of doing this.
"vcs_share_base": None,
"hg_share_base": None,
}