Bug 1421167: Remove some dead single_locale configuration options; r=Callek

All of these options only exist in the configuration files and a referenced
nowhere else in-tree.

MozReview-Commit-ID: CMeu3H1hqdx

--HG--
extra : rebase_source : df366b686557e474037534335a757ace445ba8b9

testing/mozharness/configs/single_locale/linux.py

@@ -3,7 +3,6 @@ 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",
@@ -17,7 +16,6 @@ config = {
     "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:
@@ -31,27 +29,12 @@ config = {
     "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',

testing/mozharness/configs/single_locale/linux64.py

@@ -3,7 +3,6 @@ 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",
@@ -17,7 +16,6 @@ config = {
     "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:
@@ -31,27 +29,12 @@ config = {
     "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',

testing/mozharness/configs/single_locale/linux64_devedition.py

@@ -3,7 +3,6 @@ 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",
@@ -17,7 +16,6 @@ config = {
     "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:
@@ -31,27 +29,12 @@ config = {
     "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',

testing/mozharness/configs/single_locale/linux_devedition.py

@@ -3,7 +3,6 @@ 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",
@@ -17,7 +16,6 @@ config = {
     "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:
@@ -31,27 +29,12 @@ config = {
     "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',

testing/mozharness/configs/single_locale/macosx64.py

@@ -4,7 +4,6 @@ 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',
@@ -21,7 +20,6 @@ config = {
     "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": {
@@ -39,25 +37,10 @@ config = {
     "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",
 }

testing/mozharness/configs/single_locale/macosx64_devedition.py

@@ -4,7 +4,6 @@ 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',
@@ -21,7 +20,6 @@ config = {
     "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": {
@@ -39,25 +37,10 @@ config = {
     "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",
 }

testing/mozharness/configs/single_locale/win32.py

@@ -4,7 +4,6 @@ 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",
@@ -24,7 +23,6 @@ config = {
     "ssh_key_dir": "~/.ssh",
     "log_name": "single_locale",
     "objdir": "obj-firefox",
-    "js_src_dir": "js/src",
     "vcs_share_base": "c:/builds/hg-shared",
 
     # tooltool
@@ -43,27 +41,12 @@ config = {
     "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,

testing/mozharness/configs/single_locale/win32_devedition.py

@@ -4,7 +4,6 @@ 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",
@@ -24,7 +23,6 @@ config = {
     "ssh_key_dir": "~/.ssh",
     "log_name": "single_locale",
     "objdir": "obj-firefox",
-    "js_src_dir": "js/src",
     "vcs_share_base": "c:/builds/hg-shared",
 
     # tooltool
@@ -43,27 +41,12 @@ config = {
     "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,

testing/mozharness/configs/single_locale/win64.py

@@ -4,7 +4,6 @@ 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",
@@ -24,7 +23,6 @@ config = {
     "ssh_key_dir": "~/.ssh",
     "log_name": "single_locale",
     "objdir": "obj-firefox",
-    "js_src_dir": "js/src",
     "vcs_share_base": "c:/builds/hg-shared",
 
     # tooltool
@@ -43,27 +41,12 @@ config = {
     "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,

testing/mozharness/configs/single_locale/win64_devedition.py

@@ -4,7 +4,6 @@ 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",
@@ -24,7 +23,6 @@ config = {
     "ssh_key_dir": "~/.ssh",
     "log_name": "single_locale",
     "objdir": "obj-firefox",
-    "js_src_dir": "js/src",
     "vcs_share_base": "c:/builds/hg-shared",
 
     # tooltool
@@ -43,27 +41,12 @@ config = {
     "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,

testing/mozharness/scripts/desktop_l10n.py

@@ -54,7 +54,6 @@ FAILURE_STR = "Failed"
 # 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',