Bug 1536882: Stop specifying installer to download in windows L10n jobs; r=Callek

The code that actually downloads it is behind a condition that isn't set
anywhere.

Differential Revision: https://phabricator.services.mozilla.com/D24215

--HG--
extra : moz-landing-system : lando

taskcluster/ci/l10n/kind.yml

@@ -16,7 +16,6 @@ kind-dependencies:
     - build
     - build-signing
     - repackage
-    - repackage-signing
     - toolchain
 
 primary-dependency: build
@@ -117,8 +116,6 @@ job-template:
                 EN_US_PACKAGE_NAME: target.zip
                 EN_US_BINARY_URL:
                     artifact-reference: <build-signing/{artifact_prefix}>
-                EN_US_INSTALLER_BINARY_URL:
-                    artifact-reference: <repackage-signing/{artifact_prefix}>
             android-api-16:
                 EN_US_PACKAGE_NAME: target.apk
                 EN_US_BINARY_URL:

taskcluster/ci/nightly-l10n/kind.yml

@@ -16,7 +16,6 @@ kind-dependencies:
     - build
     - build-signing
     - repackage
-    - repackage-signing
     - toolchain
 
 primary-dependency: build
@@ -147,8 +146,6 @@ job-template:
                 EN_US_PACKAGE_NAME: target.zip
                 EN_US_BINARY_URL:
                     artifact-reference: <build-signing/{artifact_prefix}>
-                EN_US_INSTALLER_BINARY_URL:
-                    artifact-reference: <repackage-signing/{artifact_prefix}>
             android-api-16-nightly:
                 EN_US_PACKAGE_NAME: target.apk
                 EN_US_BINARY_URL:

taskcluster/taskgraph/transforms/l10n.py

@@ -221,10 +221,6 @@ def setup_nightly_dependency(config, jobs):
             job['dependencies'].update({
                 'repackage': job['dependent-tasks']['repackage'].label
             })
-        if job['attributes']['build_platform'].startswith('win'):
-            job['dependencies'].update({
-                'repackage-signing': job['dependent-tasks']['repackage-signing'].label
-            })
         yield job
 
 

testing/mozharness/configs/single_locale/tc_win32.py

@@ -6,14 +6,10 @@ config = {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "obj-firefox",
         "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-        # EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
-        "EN_US_INSTALLER_BINARY_URL": os.environ.get(
-            "EN_US_INSTALLER_BINARY_URL", os.environ["EN_US_BINARY_URL"]),
         "DIST": "%(abs_objdir)s",
         "L10NBASEDIR": "../../l10n",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
         'EN_US_PACKAGE_NAME': 'target.zip',
-        'EN_US_PKG_INST_BASENAME': 'target.installer',
     },
     "upload_env": {
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),

testing/mozharness/configs/single_locale/tc_win64.py

@@ -6,14 +6,10 @@ config = {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "obj-firefox",
         "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-        # EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
-        "EN_US_INSTALLER_BINARY_URL": os.environ.get(
-            "EN_US_INSTALLER_BINARY_URL", os.environ["EN_US_BINARY_URL"]),
         "DIST": "%(abs_objdir)s",
         "L10NBASEDIR": "../../l10n",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE', 'c:/builds/tooltool_cache'),
         'EN_US_PACKAGE_NAME': 'target.zip',
-        'EN_US_PKG_INST_BASENAME': 'target.installer',
     },
     "upload_env": {
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),

toolkit/locales/l10n.mk

@@ -225,15 +225,10 @@ package-langpack-%:
 ifndef EN_US_BINARY_URL 
 EN_US_BINARY_URL = $(error You must set EN_US_BINARY_URL)
 endif
-# In taskcluster the installer comes from another location
-ifndef EN_US_INSTALLER_BINARY_URL
-EN_US_INSTALLER_BINARY_URL = $(EN_US_BINARY_URL)
-endif
 
 # Allow the overriding of PACKAGE format so we can get an EN_US build with a different
 # PACKAGE format than we are creating l10n packages with.
 EN_US_PACKAGE_NAME ?= $(PACKAGE)
-EN_US_PKG_INST_BASENAME ?= $(PKG_INST_BASENAME)
 
 # This make target allows us to wget the latest en-US binary from a specified website
 # The make installers-% target needs the en-US binary in dist/
@@ -246,11 +241,3 @@ endif
 	(cd $(ABS_DIST)/$(PKG_PATH) && \
         $(WGET) --no-cache -nv --no-iri -N -O $(PACKAGE) '$(EN_US_BINARY_URL)/$(EN_US_PACKAGE_NAME)')
 	@echo 'Downloaded $(EN_US_BINARY_URL)/$(EN_US_PACKAGE_NAME) to $(ABS_DIST)/$(PKG_PATH)/$(PACKAGE)'
-ifdef RETRIEVE_WINDOWS_INSTALLER
-ifeq ($(OS_ARCH), WINNT)
-	$(NSINSTALL) -D $(ABS_DIST)/$(PKG_INST_PATH)
-	(cd $(ABS_DIST)/$(PKG_INST_PATH) && \
-        $(WGET) --no-cache -nv --no-iri -N -O $(PKG_INST_BASENAME).exe '$(EN_US_INSTALLER_BINARY_URL)/$(PKG_PATH)$(EN_US_PKG_INST_BASENAME).exe')
-	@echo 'Downloaded $(EN_US_INSTALLER_BINARY_URL)/$(PKG_PATH)$(EN_US_PKG_INST_BASENAME).exe to $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe'
-endif
-endif