Bug 1337825 - Jamun: Change android-api-15-{l10n,nightly} to l10n bumped file r=aki
Also adds missing files
MozReview-Commit-ID: C0G6bE6wmK4
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -22,17 +22,17 @@ only-for-build-platforms:
job-template:
description:
by-build-platform:
default: Localization
android-api-15-l10n: Single Locale Repack
locales-file:
by-build-platform:
default: browser/locales/all-locales
- android-api-15-l10n: mobile/android/locales/all-locales
+ android-api-15-l10n: mobile/locales/l10n-changesets.json
run-time:
by-build-platform:
default: 36000
android-api-15-l10n: 18000
tooltool:
by-build-platform:
default: public
android-api-15-l10n: internal
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -21,17 +21,17 @@ only-for-build-platforms:
job-template:
description:
by-build-platform:
default: Localization
android-api-15-nightly: Single Locale Repack
locales-file:
by-build-platform:
default: browser/locales/all-locales
- android-api-15-nightly: mobile/android/locales/all-locales
+ android-api-15-nightly: mobile/locales/l10n-changesets.json
chunks: 6
run-time:
by-build-platform:
default: 36000
android-api-15-nightly: 18000
tooltool:
by-build-platform:
default: public
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/multi_locale/jamun_android-armv6.json
@@ -0,0 +1,28 @@
+{
+ "work_dir": ".",
+ "log_name": "multilocale",
+ "objdir": "obj-firefox",
+ "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_dir": "mobile/android/locales",
+ "ignore_locales": ["en-US", "multi"],
+ "repos": [{
+ "repo": "https://hg.mozilla.org/jamun",
+ "branch": "default",
+ "dest": "build"
+ },{
+ "repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
+ "dest": "build/configs"
+ },{
+ "repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
+ "dest": "tools"
+ }],
+ "vcs_share_base": "/builds/hg-shared",
+ "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+ "hg_l10n_tag": "default",
+ "l10n_dir": "mozilla-aurora",
+ "merge_locales": true,
+ "mozilla_dir": "build",
+ "mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/nightly"
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/multi_locale/jamun_android-x86.json
@@ -0,0 +1,28 @@
+{
+ "work_dir": ".",
+ "log_name": "multilocale",
+ "objdir": "obj-firefox",
+ "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_dir": "mobile/android/locales",
+ "ignore_locales": ["en-US", "multi"],
+ "repos": [{
+ "repo": "https://hg.mozilla.org/jamun",
+ "branch": "default",
+ "dest": "build"
+ },{
+ "repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
+ "dest": "build/configs"
+ },{
+ "repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
+ "dest": "tools"
+ }],
+ "vcs_share_base": "/builds/hg-shared",
+ "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+ "hg_l10n_tag": "default",
+ "l10n_dir": "mozilla-aurora",
+ "merge_locales": true,
+ "mozilla_dir": "build",
+ "mozconfig": "build/mobile/android/config/mozconfigs/android-x86/nightly"
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/multi_locale/jamun_android.json
@@ -0,0 +1,27 @@
+{
+ "work_dir": ".",
+ "log_name": "multilocale",
+ "objdir": "obj-firefox",
+ "locales_file": "build/mobile/android/locales/maemo-locales",
+ "locales_dir": "mobile/android/locales",
+ "ignore_locales": ["en-US", "multi"],
+ "repos": [{
+ "repo": "https://hg.mozilla.org/jamun",
+ "branch": "default",
+ "dest": "build"
+ },{
+ "repo": "https://hg.mozilla.org/build/buildbot-configs",
+ "branch": "production",
+ "dest": "build/configs"
+ },{
+ "repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
+ "dest": "tools"
+ }],
+ "vcs_share_base": "/builds/hg-shared",
+ "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+ "hg_l10n_tag": "default",
+ "l10n_dir": "mozilla-aurora",
+ "merge_locales": true,
+ "mozilla_dir": "build"
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/single_locale/jamun.py
@@ -0,0 +1,35 @@
+import os
+
+config = {
+ "nightly_build": True,
+ "branch": "jamun",
+ "en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
+ "update_channel": "nightly-jamun",
+ "latest_mar_dir": '/pub/firefox/nightly/latest-jamun-l10n',
+
+ # l10n
+ "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+
+ # mar
+ "mar_tools_url": os.environ.get(
+ "MAR_TOOLS_URL",
+ # Buildbot l10n fetches from ftp rather than setting an environ var
+ "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/mar-tools/%(platform)s"
+ ),
+
+ # repositories
+ "mozilla_dir": "jamun",
+ "repos": [{
+ "vcs": "hg",
+ "repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
+ "dest": "tools",
+ }, {
+ "vcs": "hg",
+ "repo": "https://hg.mozilla.org/projects/jamun",
+ "revision": "%(revision)s",
+ "dest": "jamun",
+ }],
+ # purge options
+ 'is_automation': True,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-15.py
@@ -0,0 +1,94 @@
+import os
+
+BRANCH = "jamun"
+MOZILLA_DIR = BRANCH
+EN_US_BINARY_URL = None # No build has been uploaded to archive.m.o
+
+config = {
+ "branch": BRANCH,
+ "log_name": "single_locale",
+ "objdir": "obj-l10n",
+ "is_automation": True,
+ "buildbot_json_path": "buildprops.json",
+ "force_clobber": True,
+ "clobberer_url": "https://api.pub.build.mozilla.org/clobberer/lastclobber",
+ "locales_file": "%s/mobile/android/locales/all-locales" % MOZILLA_DIR,
+ "locales_dir": "mobile/android/locales",
+ "ignore_locales": ["en-US"],
+ "nightly_build": True,
+ 'balrog_credentials_file': 'oauth.txt',
+ "tools_repo": "https://hg.mozilla.org/build/tools",
+ "tooltool_config": {
+ "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
+ "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
+ },
+ "exes": {
+ 'tooltool.py': '/builds/tooltool.py',
+ },
+ "repos": [{
+ "vcs": "hg",
+ "repo": "https://hg.mozilla.org/build/tools",
+ "branch": "default",
+ "dest": "tools",
+ }, {
+ "vcs": "hg",
+ "repo": "https://hg.mozilla.org/projects/jamun",
+ "revision": "%(revision)s",
+ "dest": MOZILLA_DIR,
+ }],
+ "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+ "hg_l10n_tag": "default",
+ 'vcs_share_base': "/builds/hg-shared",
+
+ "l10n_dir": "mozilla-aurora",
+ "repack_env": {
+ # so ugly, bug 951238
+ "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
+ "MOZ_OBJDIR": "obj-l10n",
+ "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
+ "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
+ "MOZ_UPDATE_CHANNEL": "nightly-jamun",
+ },
+ "upload_branch": "%s-android-api-15" % BRANCH,
+ "ssh_key_dir": "~/.ssh",
+ "merge_locales": True,
+ "mozilla_dir": MOZILLA_DIR,
+ "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
+ "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
+ "stage_product": "mobile",
+ "platform": "android",
+ "build_type": "api-15-opt",
+
+ # Balrog
+ "build_target": "Android_arm-eabi-gcc3",
+
+ # Mock
+ "mock_target": "mozilla-centos6-x86_64-android",
+ "mock_packages": ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
+ 'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
+ 'gtk2-devel', 'libnotify-devel', 'yasm',
+ 'alsa-lib-devel', 'libcurl-devel',
+ 'wireless-tools-devel', 'libX11-devel',
+ 'libXt-devel', 'mesa-libGL-devel',
+ 'gnome-vfs2-devel', 'GConf2-devel', 'wget',
+ 'mpfr', # required for system compiler
+ 'xorg-x11-font*', # fonts required for PGO
+ 'imake', # required for makedepend!?!
+ 'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1', 'yasm', 'ccache', # <-- from releng repo
+ 'valgrind', 'dbus-x11',
+ 'pulseaudio-libs-devel',
+ 'gstreamer-devel', 'gstreamer-plugins-base-devel',
+ 'freetype-2.3.11-6.el6_1.8.x86_64',
+ 'freetype-devel-2.3.11-6.el6_1.8.x86_64',
+ 'java-1.7.0-openjdk-devel',
+ 'openssh-clients',
+ 'zlib-devel-1.2.3-27.el6.i686',
+ ],
+ "mock_files": [
+ ("/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"),
+ ('/home/cltbld/.hgrc', '/builds/.hgrc'),
+ ('/builds/relengapi.tok', '/builds/relengapi.tok'),
+ ('/tools/tooltool.py', '/builds/tooltool.py'),
+ ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
+ ],
+}