Bug 1324922: Stop publishing complete MARs to balrog as part of build/repack r=catlee

taskcluster/ci/build/android.yml

@@ -88,7 +88,7 @@ android-api-15/opt:
         max-run-time: 7200
     run:
         using: mozharness
-        actions: [get-secrets build generate-build-stats multi-l10n update]
+        actions: [get-secrets build generate-build-stats multi-l10n generate-balrog-properties update]
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py

testing/mozharness/configs/builds/releng_base_linux_32_builds.py

@@ -19,7 +19,8 @@ config = {
         'upload-files',
         'sendchange',
         'check-test',
-        'update',  # decided by query_is_nightly()
+        'generate-balrog-properties',
+        # 'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {

testing/mozharness/configs/builds/releng_base_linux_64_builds.py

@@ -18,7 +18,8 @@ config = {
         'upload-files',
         'sendchange',
         'check-test',
-        'update',  # decided by query_is_nightly()
+        'generate-balrog-properties',
+        # 'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {

testing/mozharness/configs/builds/releng_base_mac_64_builds.py

@@ -15,7 +15,8 @@ config = {
         'upload-files',
         'sendchange',
         'check-test',
-        'update',  # decided by query_is_nightly()
+        'generate-balrog-properties',
+        # 'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {

testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py

@@ -12,7 +12,8 @@ config = {
         'checkout-sources',
         'build',
         'generate-build-stats',
-        'update',  # decided by query_is_nightly()
+        'generate-balrog-properties',
+        # 'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {

testing/mozharness/configs/builds/releng_base_windows_32_builds.py

@@ -19,7 +19,8 @@ config = {
         'upload-files',
         'sendchange',
         'check-test',
-        'update',  # decided by query_is_nightly()
+        'generate-balrog-properties',
+        # 'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {

testing/mozharness/configs/builds/releng_base_windows_64_builds.py

@@ -19,7 +19,8 @@ config = {
         'upload-files',
         'sendchange',
         'check-test',
-        'update',  # decided by query_is_nightly()
+        'generate-balrog-properties',
+        # 'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -2153,6 +2153,24 @@ or run without that action (ie: --no-{action})"
             self.fatal('type: "%s" is unknown for sendchange type. valid '
                        'strings are "unittest" or "talos"' % test_type)
 
+    def generate_balrog_properties(self):
+        """Generate and upload balrog properties file, if appropriate.
+
+        Wrapper around generate_balrog_props
+        """
+        # generate balrog props as artifacts
+        if not self.config.get('taskcluster_nightly'):
+            return
+
+        # grab any props available from this or previous unclobbered runs
+        self.generate_build_props(console_output=False,
+                                  halt_on_failure=False)
+
+        env = self.query_mach_build_env(multiLocale=False)
+        props_path = os.path.join(env["UPLOAD_PATH"],
+                                  'balrog_props.json')
+        self.generate_balrog_props(props_path)
+
     def update(self):
         """ submit balrog update steps. """
         if self.config.get('forced_artifact_build'):
@@ -2166,14 +2184,6 @@ or run without that action (ie: --no-{action})"
         self.generate_build_props(console_output=False,
                                   halt_on_failure=False)
 
-        # generate balrog props as artifacts
-        if self.config.get('taskcluster_nightly'):
-            env = self.query_mach_build_env(multiLocale=False)
-            props_path = os.path.join(env["UPLOAD_PATH"],
-                    'balrog_props.json')
-            self.generate_balrog_props(props_path)
-            return
-
         if self.config.get('skip_balrog_uploads'):
             self.info("Funsize will submit to balrog, skipping submission here.")
             return

testing/mozharness/scripts/fx_desktop_build.py

@@ -47,6 +47,7 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object):
                 'package-source',
                 'generate-source-signing-manifest',
                 'multi-l10n',
+                'generate-balrog-properties',
                 'update',
             ],
             'require_config_file': True,