From 9bf70967d92742545bc31988b0e4438948a41149 Mon Sep 17 00:00:00 2001 From: Jordan Lund Date: Wed, 17 May 2017 17:24:01 -0700 Subject: [PATCH] Bug 1365588 - fix l10n repacks for DevEdition on Beta, gecko, DONTBUILD, r=rail MozReview-Commit-ID: 1arksrFhsv9 --HG-- rename : browser/config/mozconfigs/linux32/l10n-mozconfig => browser/config/mozconfigs/linux32/l10n-mozconfig-devedition rename : browser/config/mozconfigs/linux64/l10n-mozconfig => browser/config/mozconfigs/linux64/l10n-mozconfig-devedition rename : browser/config/mozconfigs/macosx64/l10n-mozconfig => browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition rename : browser/config/mozconfigs/win32/l10n-mozconfig => browser/config/mozconfigs/win32/l10n-mozconfig-devedition rename : browser/config/mozconfigs/win64/l10n-mozconfig => browser/config/mozconfigs/win64/l10n-mozconfig-devedition rename : testing/mozharness/configs/single_locale/dev-mozilla-beta.py => testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py rename : testing/mozharness/configs/single_locale/linux64.py => testing/mozharness/configs/single_locale/linux64_devedition.py rename : testing/mozharness/configs/single_locale/linux.py => testing/mozharness/configs/single_locale/linux_devedition.py rename : testing/mozharness/configs/single_locale/macosx64.py => testing/mozharness/configs/single_locale/macosx64_devedition.py rename : testing/mozharness/configs/single_locale/mozilla-beta.py => testing/mozharness/configs/single_locale/mozilla-beta_devedition.py rename : testing/mozharness/configs/single_locale/win32.py => testing/mozharness/configs/single_locale/win32_devedition.py rename : testing/mozharness/configs/single_locale/win64.py => testing/mozharness/configs/single_locale/win64_devedition.py extra : rebase_source : c1242ce513624d519756d1628896f3343a047d00 extra : amend_source : f434761fe2f88cfc4af97229d5bdbe07becf75a2 extra : source : 9cee0e8b00d28d7e977df6ee3e1adc9680004b8d --- .../linux32/l10n-mozconfig-devedition | 20 +++ .../linux64/l10n-mozconfig-devedition | 20 +++ .../macosx64/l10n-mozconfig-devedition | 22 ++++ .../win32/l10n-mozconfig-devedition | 19 +++ .../win64/l10n-mozconfig-devedition | 20 +++ .../dev-mozilla-beta_devedition.py | 37 ++++++ .../single_locale/linux32_devedition.py | 1 + .../single_locale/linux64_devedition.py | 104 +++++++++++++++ .../configs/single_locale/linux_devedition.py | 124 ++++++++++++++++++ .../single_locale/macosx64_devedition.py | 72 ++++++++++ .../single_locale/mozilla-beta_devedition.py | 37 ++++++ .../configs/single_locale/win32_devedition.py | 76 +++++++++++ .../configs/single_locale/win64_devedition.py | 76 +++++++++++ 13 files changed, 628 insertions(+) create mode 100644 browser/config/mozconfigs/linux32/l10n-mozconfig-devedition create mode 100644 browser/config/mozconfigs/linux64/l10n-mozconfig-devedition create mode 100644 browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition create mode 100644 browser/config/mozconfigs/win32/l10n-mozconfig-devedition create mode 100644 browser/config/mozconfigs/win64/l10n-mozconfig-devedition create mode 100644 testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py create mode 120000 testing/mozharness/configs/single_locale/linux32_devedition.py create mode 100644 testing/mozharness/configs/single_locale/linux64_devedition.py create mode 100644 testing/mozharness/configs/single_locale/linux_devedition.py create mode 100644 testing/mozharness/configs/single_locale/macosx64_devedition.py create mode 100644 testing/mozharness/configs/single_locale/mozilla-beta_devedition.py create mode 100644 testing/mozharness/configs/single_locale/win32_devedition.py create mode 100644 testing/mozharness/configs/single_locale/win64_devedition.py diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition new file mode 100644 index 000000000000..c424d85cbac9 --- /dev/null +++ b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition @@ -0,0 +1,20 @@ +no_sccache=1 + +ac_add_options --with-l10n-base=../../l10n +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-branding=browser/branding/aurora + +. $topsrcdir/build/unix/mozconfig.linux32 + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +ac_add_options --disable-stdcxx-compat + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition new file mode 100644 index 000000000000..5840790c36a4 --- /dev/null +++ b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition @@ -0,0 +1,20 @@ +no_sccache=1 + +ac_add_options --with-l10n-base=../../l10n +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-branding=browser/branding/aurora + +. $topsrcdir/build/unix/mozconfig.linux + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +ac_add_options --disable-stdcxx-compat + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition new file mode 100644 index 000000000000..f0675932bd94 --- /dev/null +++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition @@ -0,0 +1,22 @@ +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/build/macosx/mozconfig.common" + +ac_add_options --with-l10n-base=../../l10n +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-branding=browser/branding/aurora + +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then +ac_add_options --with-macbundlename-prefix=Firefox +fi + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. "$topsrcdir/build/mozconfig.common.override" +. "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition new file mode 100644 index 000000000000..5542dbbc031c --- /dev/null +++ b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition @@ -0,0 +1,19 @@ +. "$topsrcdir/browser/config/mozconfigs/common" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-l10n-base=../../l10n +ac_add_options --with-windows-version=603 +ac_add_options --with-branding=browser/branding/aurora + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. $topsrcdir/build/win32/mozconfig.vs-latest + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/l10n-mozconfig-devedition b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition new file mode 100644 index 000000000000..03a0365a0c8f --- /dev/null +++ b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition @@ -0,0 +1,20 @@ +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-l10n-base=../../l10n +ac_add_options --with-windows-version=603 +ac_add_options --with-branding=browser/branding/aurora + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. $topsrcdir/build/win64/mozconfig.vs-latest + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py b/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py new file mode 100644 index 000000000000..56e133f48f46 --- /dev/null +++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py @@ -0,0 +1,37 @@ +config = { + "branch": "date", + "nightly_build": True, + "update_channel": "aurora-dev", # devedition uses aurora based branding + + # l10n + "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta", + + # repositories + # staging beta dev releases use date repo for now + "mozilla_dir": "date", + "repos": [{ + "vcs": "hg", + "repo": "https://hg.mozilla.org/build/tools", + "branch": "default", + "dest": "tools", + }, { + "vcs": "hg", + "repo": "https://hg.mozilla.org/projects/date", + "branch": "%(revision)s", + "dest": "date", + "clone_upstream_url": "https://hg.mozilla.org/mozilla-unified", + }], + # purge options + 'is_automation': True, + 'purge_minsize': 12, + 'default_actions': [ + "clobber", + "pull", + "clone-locales", + "list-locales", + "setup", + "repack", + "taskcluster-upload", + "summary", + ], +} diff --git a/testing/mozharness/configs/single_locale/linux32_devedition.py b/testing/mozharness/configs/single_locale/linux32_devedition.py new file mode 120000 index 000000000000..b308e6feb977 --- /dev/null +++ b/testing/mozharness/configs/single_locale/linux32_devedition.py @@ -0,0 +1 @@ +linux_devedition.py \ No newline at end of file diff --git a/testing/mozharness/configs/single_locale/linux64_devedition.py b/testing/mozharness/configs/single_locale/linux64_devedition.py new file mode 100644 index 000000000000..7a13602f2be1 --- /dev/null +++ b/testing/mozharness/configs/single_locale/linux64_devedition.py @@ -0,0 +1,104 @@ +import os + +config = { + "platform": "linux64", + "stage_product": "firefox", + "update_platform": "Linux_x86_64-gcc3", + "mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition", + "bootstrap_env": { + "MOZ_OBJDIR": "obj-l10n", + "EN_US_BINARY_URL": "%(en_us_binary_url)s", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s/", + "MOZ_UPDATE_CHANNEL": "%(update_channel)s", + "DIST": "%(abs_objdir)s", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s/", + "L10NBASEDIR": "../../l10n", + "MOZ_MAKE_COMPLETE_MAR": "1", + 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_HOME': '/builds', + 'EN_US_PACKAGE_NAME': 'target.tar.bz2', + }, + "ssh_key_dir": "/home/mock_mozilla/.ssh", + "log_name": "single_locale", + "objdir": "obj-l10n", + "js_src_dir": "js/src", + "vcs_share_base": "/builds/hg-shared", + + # tooltool + 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/', + 'tooltool_script': ["/builds/tooltool.py"], + 'tooltool_bootstrap': "setup.sh", + 'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/releng.manifest', + # balrog credential file: + 'balrog_credentials_file': 'oauth.txt', + + # l10n + "ignore_locales": ["en-US", "ja-JP-mac"], + "l10n_dir": "l10n", + "locales_file": "%(branch)s/browser/locales/all-locales", + "locales_dir": "browser/locales", + "hg_l10n_tag": "default", + "merge_locales": True, + + # MAR + "previous_mar_dir": "dist/previous", + "current_mar_dir": "dist/current", + "update_mar_dir": "dist/update", # sure? + "previous_mar_filename": "previous.mar", + "current_work_mar_dir": "current.work", + "package_base_dir": "dist/l10n-stage", + "application_ini": "application.ini", + "buildid_section": 'App', + "buildid_option": "BuildID", + "unpack_script": "tools/update-packaging/unwrap_full_update.pl", + "incremental_update_script": "tools/update-packaging/make_incremental_update.sh", + "balrog_release_pusher_script": "scripts/updates/balrog-release-pusher.py", + "update_packaging_dir": "tools/update-packaging", + "local_mar_tool_dir": "dist/host/bin", + "mar": "mar", + "mbsdiff": "mbsdiff", + "current_mar_filename": "firefox-%(version)s.%(locale)s.linux-x86_64.complete.mar", + "complete_mar": "firefox-%(version)s.en-US.linux-x86_64.complete.mar", + "localized_mar": "firefox-%(version)s.%(locale)s.linux-x86_64.complete.mar", + "partial_mar": "firefox-%(version)s.%(locale)s.linux-x86_64.partial.%(from_buildid)s-%(to_buildid)s.mar", + "installer_file": "firefox-%(version)s.en-US.linux-x86_64.tar.bz2", + + # Mock + 'mock_target': 'mozilla-centos6-x86_64', + + 'mock_packages': [ + 'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial', + 'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General', + 'yasm', 'wget', + 'mpfr', # required for system compiler + 'xorg-x11-font*', # fonts required for PGO + 'imake', # required for makedepend!?! + ### <-- from releng repo + 'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1', + 'yasm', 'ccache', + ### + 'valgrind', 'dbus-x11', + ######## 64 bit specific ########### + 'glibc-static', 'libstdc++-static', + 'gtk2-devel', 'libnotify-devel', + 'alsa-lib-devel', 'libcurl-devel', 'wireless-tools-devel', + 'libX11-devel', 'libXt-devel', 'mesa-libGL-devel', 'gnome-vfs2-devel', + 'GConf2-devel', + ### from releng repo + 'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1', + 'yasm', 'ccache', + ### + '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' + ], + 'mock_files': [ + ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'), + ('/home/cltbld/.hgrc', '/builds/.hgrc'), + ('/home/cltbld/.boto', '/builds/.boto'), + ('/builds/gapi.data', '/builds/gapi.data'), + ('/builds/relengapi.tok', '/builds/relengapi.tok'), + ('/tools/tooltool.py', '/builds/tooltool.py'), + ('/usr/local/lib/hgext', '/usr/local/lib/hgext'), + ], +} diff --git a/testing/mozharness/configs/single_locale/linux_devedition.py b/testing/mozharness/configs/single_locale/linux_devedition.py new file mode 100644 index 000000000000..9717294624be --- /dev/null +++ b/testing/mozharness/configs/single_locale/linux_devedition.py @@ -0,0 +1,124 @@ +import os + +config = { + "platform": "linux", + "stage_product": "firefox", + "update_platform": "Linux_x86-gcc3", + "mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition", + "bootstrap_env": { + "MOZ_OBJDIR": "obj-l10n", + "EN_US_BINARY_URL": "%(en_us_binary_url)s", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s/", + "MOZ_UPDATE_CHANNEL": "%(update_channel)s", + "DIST": "%(abs_objdir)s", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s/", + "L10NBASEDIR": "../../l10n", + "MOZ_MAKE_COMPLETE_MAR": "1", + 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_HOME': '/builds', + 'EN_US_PACKAGE_NAME': 'target.tar.bz2', + }, + "ssh_key_dir": "/home/mock_mozilla/.ssh", + "log_name": "single_locale", + "objdir": "obj-l10n", + "js_src_dir": "js/src", + "vcs_share_base": "/builds/hg-shared", + + # tooltool + 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/', + 'tooltool_script': ["/builds/tooltool.py"], + 'tooltool_bootstrap': "setup.sh", + 'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux32/releng.manifest', + # balrog credential file: + 'balrog_credentials_file': 'oauth.txt', + + # l10n + "ignore_locales": ["en-US", "ja-JP-mac"], + "l10n_dir": "l10n", + "locales_file": "%(branch)s/browser/locales/all-locales", + "locales_dir": "browser/locales", + "hg_l10n_tag": "default", + "merge_locales": True, + + # MAR + "previous_mar_dir": "dist/previous", + "current_mar_dir": "dist/current", + "update_mar_dir": "dist/update", # sure? + "previous_mar_filename": "previous.mar", + "current_work_mar_dir": "current.work", + "package_base_dir": "dist/l10n-stage", + "application_ini": "application.ini", + "buildid_section": 'App', + "buildid_option": "BuildID", + "unpack_script": "tools/update-packaging/unwrap_full_update.pl", + "incremental_update_script": "tools/update-packaging/make_incremental_update.sh", + "balrog_release_pusher_script": "scripts/updates/balrog-release-pusher.py", + "update_packaging_dir": "tools/update-packaging", + "local_mar_tool_dir": "dist/host/bin", + "mar": "mar", + "mbsdiff": "mbsdiff", + "current_mar_filename": "firefox-%(version)s.%(locale)s.linux-i686.complete.mar", + "complete_mar": "firefox-%(version)s.en-US.linux-i686.complete.mar", + "localized_mar": "firefox-%(version)s.%(locale)s.linux-i686.complete.mar", + "partial_mar": "firefox-%(version)s.%(locale)s.linux-i686.partial.%(from_buildid)s-%(to_buildid)s.mar", + 'installer_file': "firefox-%(version)s.en-US.linux-i686.tar.bz2", + + # Mock + 'mock_target': 'mozilla-centos6-x86_64', + 'mock_packages': [ + 'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial', + 'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General', + 'yasm', 'wget', + 'mpfr', # required for system compiler + 'xorg-x11-font*', # fonts required for PGO + 'imake', # required for makedepend!?! + ### <-- from releng repo + 'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1', + 'yasm', 'ccache', + ### + 'valgrind', + ######## 32 bit specific ########### + 'glibc-static.i686', 'libstdc++-static.i686', + 'gtk2-devel.i686', 'libnotify-devel.i686', + 'alsa-lib-devel.i686', 'libcurl-devel.i686', + 'wireless-tools-devel.i686', 'libX11-devel.i686', + 'libXt-devel.i686', 'mesa-libGL-devel.i686', + 'gnome-vfs2-devel.i686', 'GConf2-devel.i686', + 'pulseaudio-libs-devel.i686', + 'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686', + # Packages already installed in the mock environment, as x86_64 + # packages. + 'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686', + # yum likes to install .x86_64 -devel packages that satisfy .i686 + # -devel packages dependencies. So manually install the dependencies + # of the above packages. + 'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686', + 'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686', + 'fontconfig-devel.i686', 'glib2-devel.i686', + 'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686', + 'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686', + 'libXcursor-devel.i686', 'libXdamage-devel.i686', + 'libXdmcp-devel.i686', 'libXext-devel.i686', 'libXfixes-devel.i686', + 'libXft-devel.i686', 'libXi-devel.i686', 'libXinerama-devel.i686', + 'libXrandr-devel.i686', 'libXrender-devel.i686', + 'libXxf86vm-devel.i686', 'libdrm-devel.i686', 'libidn-devel.i686', + 'libpng-devel.i686', 'libxcb-devel.i686', 'libxml2-devel.i686', + 'pango-devel.i686', 'perl-devel.i686', 'pixman-devel.i686', + 'zlib-devel.i686', + # Freetype packages need to be installed be version, because a newer + # version is available, but we don't want it for Firefox builds. + 'freetype-2.3.11-6.el6_1.8.i686', + 'freetype-devel-2.3.11-6.el6_1.8.i686', + 'freetype-2.3.11-6.el6_1.8.x86_64', + ######## 32 bit specific ########### + ], + 'mock_files': [ + ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'), + ('/home/cltbld/.hgrc', '/builds/.hgrc'), + ('/home/cltbld/.boto', '/builds/.boto'), + ('/builds/gapi.data', '/builds/gapi.data'), + ('/builds/relengapi.tok', '/builds/relengapi.tok'), + ('/tools/tooltool.py', '/builds/tooltool.py'), + ('/usr/local/lib/hgext', '/usr/local/lib/hgext'), + ], +} diff --git a/testing/mozharness/configs/single_locale/macosx64_devedition.py b/testing/mozharness/configs/single_locale/macosx64_devedition.py new file mode 100644 index 000000000000..4e59e6b1c8cb --- /dev/null +++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py @@ -0,0 +1,72 @@ +import os + +config = { + # mozconfig file to use, it depends on branch and platform names + "platform": "macosx64", + "stage_product": "firefox", + "update_platform": "Darwin_x86_64-gcc3", + "mozconfig": "%(branch)s/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition", + "bootstrap_env": { + "SHELL": '/bin/bash', + "MOZ_OBJDIR": "obj-l10n", + "EN_US_BINARY_URL": "%(en_us_binary_url)s", + "MOZ_UPDATE_CHANNEL": "%(update_channel)s", + "MOZ_PKG_PLATFORM": "mac", + # "IS_NIGHTLY": "yes", + "DIST": "%(abs_objdir)s", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s/", + "L10NBASEDIR": "../../l10n", + "MOZ_MAKE_COMPLETE_MAR": "1", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s/", + 'TOOLTOOL_CACHE': '/builds/tooltool_cache', + 'TOOLTOOL_HOME': '/builds', + }, + "ssh_key_dir": "~/.ssh", + "log_name": "single_locale", + "objdir": "obj-l10n", + "js_src_dir": "js/src", + "vcs_share_base": "/builds/hg-shared", + + "upload_env_extra": { + "MOZ_PKG_PLATFORM": "mac", + }, + + # tooltool + 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/', + 'tooltool_script': ["/builds/tooltool.py"], + 'tooltool_bootstrap': "setup.sh", + 'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/releng.manifest', + # balrog credential file: + 'balrog_credentials_file': 'oauth.txt', + + # l10n + "ignore_locales": ["en-US", "ja"], + "l10n_dir": "l10n", + "locales_file": "%(branch)s/browser/locales/all-locales", + "locales_dir": "browser/locales", + "hg_l10n_tag": "default", + "merge_locales": True, + + # MAR + "previous_mar_dir": "dist/previous", + "current_mar_dir": "dist/current", + "update_mar_dir": "dist/update", # sure? + "previous_mar_filename": "previous.mar", + "current_work_mar_dir": "current.work", + "package_base_dir": "dist/l10n-stage", + "application_ini": "Contents/Resources/application.ini", + "buildid_section": 'App', + "buildid_option": "BuildID", + "unpack_script": "tools/update-packaging/unwrap_full_update.pl", + "incremental_update_script": "tools/update-packaging/make_incremental_update.sh", + "balrog_release_pusher_script": "scripts/updates/balrog-release-pusher.py", + "update_packaging_dir": "tools/update-packaging", + "local_mar_tool_dir": "dist/host/bin", + "mar": "mar", + "mbsdiff": "mbsdiff", + "current_mar_filename": "firefox-%(version)s.%(locale)s.mac.complete.mar", + "complete_mar": "firefox-%(version)s.en-US.mac.complete.mar", + "localized_mar": "firefox-%(version)s.%(locale)s.mac.complete.mar", + "partial_mar": "firefox-%(version)s.%(locale)s.mac.partial.%(from_buildid)s-%(to_buildid)s.mar", + 'installer_file': "firefox-%(version)s.en-US.mac.dmg", +} diff --git a/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py b/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py new file mode 100644 index 000000000000..00b5c2744a9c --- /dev/null +++ b/testing/mozharness/configs/single_locale/mozilla-beta_devedition.py @@ -0,0 +1,37 @@ +config = { + "nightly_build": True, + "branch": "mozilla-beta", + "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-beta/", + "update_channel": "aurora", # devedition uses aurora based branding + + # l10n + "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta", + + # repositories + "mozilla_dir": "mozilla-beta", + "repos": [{ + "vcs": "hg", + "repo": "https://hg.mozilla.org/build/tools", + "branch": "default", + "dest": "tools", + }, { + "vcs": "hg", + "repo": "https://hg.mozilla.org/releases/mozilla-beta", + "revision": "%(revision)s", + "dest": "mozilla-beta", + "clone_upstream_url": "https://hg.mozilla.org/mozilla-unified", + }], + # purge options + 'purge_minsize': 12, + 'is_automation': True, + 'default_actions': [ + "clobber", + "pull", + "clone-locales", + "list-locales", + "setup", + "repack", + "taskcluster-upload", + "summary", + ], +} diff --git a/testing/mozharness/configs/single_locale/win32_devedition.py b/testing/mozharness/configs/single_locale/win32_devedition.py new file mode 100644 index 000000000000..aa79e96d6ac5 --- /dev/null +++ b/testing/mozharness/configs/single_locale/win32_devedition.py @@ -0,0 +1,76 @@ +import os +import sys + +config = { + "platform": "win32", + "stage_product": "firefox", + "update_platform": "WINNT_x86-msvc", + "mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig-devedition", + "bootstrap_env": { + "MOZ_OBJDIR": "obj-l10n", + "EN_US_BINARY_URL": "%(en_us_binary_url)s", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s", + "MOZ_UPDATE_CHANNEL": "%(update_channel)s", + "DIST": "%(abs_objdir)s", + "L10NBASEDIR": "../../l10n", + "MOZ_MAKE_COMPLETE_MAR": "1", + "PATH": 'C:\\mozilla-build\\nsis-3.01;' + '%s' % (os.environ.get('path')), + 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache', + 'TOOLTOOL_HOME': '/c/builds', + }, + "ssh_key_dir": "~/.ssh", + "log_name": "single_locale", + "objdir": "obj-l10n", + "js_src_dir": "js/src", + "vcs_share_base": "c:/builds/hg-shared", + + # tooltool + 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/', + 'tooltool_script': [sys.executable, + 'C:/mozilla-build/tooltool.py'], + 'tooltool_bootstrap': "setup.sh", + 'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest', + # balrog credential file: + 'balrog_credentials_file': 'oauth.txt', + + # l10n + "ignore_locales": ["en-US", "ja-JP-mac"], + "l10n_dir": "l10n", + "locales_file": "%(branch)s/browser/locales/all-locales", + "locales_dir": "browser/locales", + "hg_l10n_tag": "default", + "merge_locales": True, + + # MAR + "previous_mar_dir": "dist\\previous", + "current_mar_dir": "dist\\current", + "update_mar_dir": "dist\\update", # sure? + "previous_mar_filename": "previous.mar", + "current_work_mar_dir": "current.work", + "package_base_dir": "dist\\l10n-stage", + "application_ini": "application.ini", + "buildid_section": 'App', + "buildid_option": "BuildID", + "unpack_script": "tools\\update-packaging\\unwrap_full_update.pl", + "incremental_update_script": "tools\\update-packaging\\make_incremental_update.sh", + "balrog_release_pusher_script": "scripts\\updates\\balrog-release-pusher.py", + "update_packaging_dir": "tools\\update-packaging", + "local_mar_tool_dir": "dist\\host\\bin", + "mar": "mar.exe", + "mbsdiff": "mbsdiff.exe", + "current_mar_filename": "firefox-%(version)s.%(locale)s.win32.complete.mar", + "complete_mar": "firefox-%(version)s.en-US.win32.complete.mar", + "localized_mar": "firefox-%(version)s.%(locale)s.win32.complete.mar", + "partial_mar": "firefox-%(version)s.%(locale)s.win32.partial.%(from_buildid)s-%(to_buildid)s.mar", + 'installer_file': "firefox-%(version)s.en-US.win32.installer.exe", + + # use mozmake? + "enable_mozmake": True, + 'exes': { + 'virtualenv': [ + sys.executable, + 'c:/mozilla-build/buildbotve/virtualenv.py' + ], + } +} diff --git a/testing/mozharness/configs/single_locale/win64_devedition.py b/testing/mozharness/configs/single_locale/win64_devedition.py new file mode 100644 index 000000000000..a5a2dcdd03eb --- /dev/null +++ b/testing/mozharness/configs/single_locale/win64_devedition.py @@ -0,0 +1,76 @@ +import os +import sys + +config = { + "platform": "win64", + "stage_product": "firefox", + "update_platform": "WINNT_x86_64-msvc", + "mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig-devedition", + "bootstrap_env": { + "MOZ_OBJDIR": "obj-l10n", + "EN_US_BINARY_URL": "%(en_us_binary_url)s", + "MOZ_UPDATE_CHANNEL": "%(update_channel)s", + "DIST": "%(abs_objdir)s", + "LOCALE_MERGEDIR": "%(abs_merge_dir)s", + "L10NBASEDIR": "../../l10n", + "MOZ_MAKE_COMPLETE_MAR": "1", + "PATH": 'C:\\mozilla-build\\nsis-3.01;' + '%s' % (os.environ.get('path')), + 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache', + 'TOOLTOOL_HOME': '/c/builds', + }, + "ssh_key_dir": "~/.ssh", + "log_name": "single_locale", + "objdir": "obj-l10n", + "js_src_dir": "js/src", + "vcs_share_base": "c:/builds/hg-shared", + + # tooltool + 'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/', + 'tooltool_script': [sys.executable, + 'C:/mozilla-build/tooltool.py'], + 'tooltool_bootstrap': "setup.sh", + 'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/releng.manifest', + # balrog credential file: + 'balrog_credentials_file': 'oauth.txt', + + # l10n + "ignore_locales": ["en-US", "ja-JP-mac"], + "l10n_dir": "l10n", + "locales_file": "%(branch)s/browser/locales/all-locales", + "locales_dir": "browser/locales", + "hg_l10n_tag": "default", + "merge_locales": True, + + # MAR + "previous_mar_dir": "dist\\previous", + "current_mar_dir": "dist\\current", + "update_mar_dir": "dist\\update", # sure? + "previous_mar_filename": "previous.mar", + "current_work_mar_dir": "current.work", + "package_base_dir": "dist\\l10n-stage", + "application_ini": "application.ini", + "buildid_section": 'App', + "buildid_option": "BuildID", + "unpack_script": "tools\\update-packaging\\unwrap_full_update.pl", + "incremental_update_script": "tools\\update-packaging\\make_incremental_update.sh", + "balrog_release_pusher_script": "scripts\\updates\\balrog-release-pusher.py", + "update_packaging_dir": "tools\\update-packaging", + "local_mar_tool_dir": "dist\\host\\bin", + "mar": "mar.exe", + "mbsdiff": "mbsdiff.exe", + "current_mar_filename": "firefox-%(version)s.%(locale)s.win64.complete.mar", + "complete_mar": "firefox-%(version)s.en-US.win64.complete.mar", + "localized_mar": "firefox-%(version)s.%(locale)s.win64.complete.mar", + "partial_mar": "firefox-%(version)s.%(locale)s.win64.partial.%(from_buildid)s-%(to_buildid)s.mar", + 'installer_file': "firefox-%(version)s.en-US.win64.installer.exe", + + # use mozmake? + "enable_mozmake": True, + 'exes': { + 'virtualenv': [ + sys.executable, + 'c:/mozilla-build/buildbotve/virtualenv.py' + ], + } +}