Bug 1381577 - Part AA; Enable windows beetmover for en-US and l10n, side affect of enabling balrog for windows nightlies. r=kmoir

Land date changes to support windows nightlies onto central

MozReview-Commit-ID: CHUMWUxbyqt

--HG--
extra : rebase_source : 29fa30145460ad5d4bbba661978c46d7fb8402af

taskcluster/ci/beetmover-repackage/kind.yml

@@ -14,3 +14,5 @@ kind-dependencies:
 
 only-for-build-platforms:
   - macosx64-nightly/opt
+  - win32-nightly/opt
+  - win64-nightly/opt

taskcluster/taskgraph/transforms/beetmover.py

@@ -157,7 +157,14 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
         "host/bin/mar",
         "host/bin/mbsdiff",
     ],
-
+    'win32-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
+        "host/bin/mar.exe",
+        "host/bin/mbsdiff.exe",
+    ],
+    'win64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
+        "host/bin/mar.exe",
+        "host/bin/mbsdiff.exe",
+    ],
     'linux64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'linux-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'android-x86-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
@@ -167,6 +174,8 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
     'android-api-15-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
     'android-api-15-old-id-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
     'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
+    'win32-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
+    'win64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
 }
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
 # need to be transfered to S3, please be aware you also need to follow-up
@@ -198,7 +207,12 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
         "target.dmg",
         "target.dmg.asc",
     ],
-
+    'win32-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US + [
+        "target.zip",
+    ],
+    'win64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US + [
+        "target.zip",
+    ],
     'linux64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N + [
         "target.tar.bz2",
         "target.tar.bz2.asc",
@@ -217,6 +231,12 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
         "target.dmg",
         "target.dmg.asc",
     ],
+    'win32-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N + [
+        "target.zip",
+    ],
+    'win64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N + [
+        "target.zip",
+    ],
 
 }
 

taskcluster/taskgraph/transforms/beetmover_repackage.py

@@ -18,6 +18,12 @@ from voluptuous import Any, Required, Optional
 import logging
 logger = logging.getLogger(__name__)
 
+
+_WINDOWS_BUILD_PLATFORMS = [
+    'win64-nightly',
+    'win32-nightly'
+]
+
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
 # need to be transfered to S3, please be aware you also need to follow-up
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
@@ -62,13 +68,29 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
         "host/bin/mbsdiff",
     ],
     'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
+    'win64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
+        "host/bin/mar.exe",
+        "host/bin/mbsdiff.exe",
+    ],
+    'win64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
+    'win32-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
+        "host/bin/mar.exe",
+        "host/bin/mbsdiff.exe",
+    ],
+    'win32-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
 }
+
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
 # need to be transfered to S3, please be aware you also need to follow-up
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
 # See example in bug 1348286
 UPSTREAM_ARTIFACT_SIGNED_PATHS = {
+    'win64-nightly': ['target.zip'],
+    'win64-nightly-l10n': ['target.zip'],
+    'win32-nightly': ['target.zip'],
+    'win32-nightly-l10n': ['target.zip'],
 }
+
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
 # need to be transfered to S3, please be aware you also need to follow-up
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
@@ -84,6 +106,18 @@ UPSTREAM_ARTIFACT_REPACKAGE_PATHS = {
 UPSTREAM_ARTIFACT_SIGNED_REPACKAGE_PATHS = {
     'macosx64-nightly': ['target.complete.mar'],
     'macosx64-nightly-l10n': ['target.complete.mar'],
+    'win64-nightly': ['target.complete.mar', 'target.installer.exe'],
+    'win64-nightly-l10n': ['target.complete.mar', 'target.installer.exe'],
+    'win32-nightly': [
+        'target.complete.mar',
+        'target.installer.exe',
+        'target.stub-installer.exe'
+    ],
+    'win32-nightly-l10n': [
+        'target.complete.mar',
+        'target.installer.exe',
+        'target.stub-installer.exe'
+    ],
 }
 
 # Voluptuous uses marker objects as dictionary *keys*, but they are not
@@ -243,7 +277,12 @@ def generate_upstream_artifacts(build_task_ref, build_signing_task_ref,
 
 def is_valid_beetmover_job(job):
     # windows builds don't have docker-image, so fewer dependencies
-    return (len(job["dependencies"]) == 5 and
+    if any(b in job['attributes']['build_platform'] for b in _WINDOWS_BUILD_PLATFORMS):
+        expected_dep_count = 4
+    else:
+        expected_dep_count = 5
+
+    return (len(job["dependencies"]) == expected_dep_count and
             any(['repackage' in j for j in job['dependencies']]))
 
 

taskcluster/taskgraph/util/scriptworker.py

@@ -99,6 +99,7 @@ BEETMOVER_SCOPE_ALIAS_TO_TARGET_TASK = [[
         'nightly_fennec',
         'nightly_linux',
         'nightly_macosx',
+        'nightly_win',
         'mozilla_beta_tasks',
         'mozilla_release_tasks',
     ])