--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -1,62 +1,45 @@
import os
config = {
"platform": "linux",
"stage_product": "firefox",
- "update_platform": "Linux_x86-gcc3",
"mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
# 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",
# 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
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -1,62 +1,45 @@
import os
config = {
"platform": "linux64",
"stage_product": "firefox",
- "update_platform": "Linux_x86_64-gcc3",
"mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
# 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",
# 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',
--- a/testing/mozharness/configs/single_locale/linux64_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@@ -1,62 +1,45 @@
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-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
# 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",
# 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',
--- a/testing/mozharness/configs/single_locale/linux_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@@ -1,62 +1,45 @@
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-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.tar.bz2',
},
"ssh_key_dir": "/home/mock_mozilla/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
# 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",
# 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
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -1,32 +1,30 @@
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",
"bootstrap_env": {
"SHELL": '/bin/bash',
"MOZ_OBJDIR": "obj-firefox",
"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",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.dmg',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
"upload_env_extra": {
"MOZ_PKG_PLATFORM": "mac",
},
# balrog credential file:
'balrog_credentials_file': 'oauth.txt',
@@ -34,30 +32,15 @@ config = {
# 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",
# 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",
}
--- a/testing/mozharness/configs/single_locale/macosx64_devedition.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@@ -1,32 +1,30 @@
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-firefox",
"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",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'EN_US_PACKAGE_NAME': 'target.dmg',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "/builds/hg-shared",
"upload_env_extra": {
"MOZ_PKG_PLATFORM": "mac",
},
# balrog credential file:
'balrog_credentials_file': 'oauth.txt',
@@ -34,30 +32,15 @@ config = {
# 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",
# 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",
}
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -1,15 +1,14 @@
import os
import sys
config = {
"platform": "win32",
"stage_product": "firefox",
- "update_platform": "WINNT_x86-msvc",
"mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
@@ -19,17 +18,16 @@ config = {
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
'EN_US_PACKAGE_NAME': 'target.zip',
'EN_US_PKG_INST_BASENAME': 'target.installer',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',
# balrog credential file:
@@ -38,37 +36,22 @@ config = {
# 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",
# 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'
],
--- a/testing/mozharness/configs/single_locale/win32_devedition.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@@ -1,15 +1,14 @@
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-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
@@ -19,17 +18,16 @@ config = {
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
'EN_US_PACKAGE_NAME': 'target.zip',
'EN_US_PKG_INST_BASENAME': 'target.installer',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',
# balrog credential file:
@@ -38,37 +36,22 @@ config = {
# 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",
# 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'
],
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -1,15 +1,14 @@
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",
"bootstrap_env": {
"MOZ_OBJDIR": "obj-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
@@ -19,17 +18,16 @@ config = {
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
'EN_US_PACKAGE_NAME': 'target.zip',
'EN_US_PKG_INST_BASENAME': 'target.installer',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',
# balrog credential file:
@@ -38,37 +36,22 @@ config = {
# 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",
# 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'
],
--- a/testing/mozharness/configs/single_locale/win64_devedition.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@@ -1,15 +1,14 @@
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-firefox",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
@@ -19,17 +18,16 @@ config = {
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
'EN_US_PACKAGE_NAME': 'target.zip',
'EN_US_PKG_INST_BASENAME': 'target.installer',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-firefox",
- "js_src_dir": "js/src",
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',
# balrog credential file:
@@ -38,37 +36,22 @@ config = {
# 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",
# 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'
],
--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -49,17 +49,16 @@ FAILURE = 1
SUCCESS_STR = "Success"
FAILURE_STR = "Failed"
# mandatory configuration options, without them, this script will not work
# it's a list of values that are already known before starting a build
configuration_tokens = ('branch',
'platform',
- 'update_platform',
'update_channel',
'ssh_key_dir',
'stage_product',
'upload_environment',
)
# some other values such as "%(version)s", "%(buildid)s", ...
# are defined at run time and they cannot be enforced in the _pre_config_lock
# phase