Backed out changesets c9812dd7d27a and 387d8415d05e (bug 1362148) because it broke various Android jobs.

2017-05-12 11:47:22 -04:00 · 2017-05-12 11:47:22 -04:00 · 1fc10504ff
--- a/taskcluster/ci/artifact-build/kind.yml
+++ b/taskcluster/ci/artifact-build/kind.yml
@ -27,7 +27,7 @@ jobs:
            max-run-time: 36000
        run:
            using: mozharness
-            actions: [get-secrets build]
+            actions: [get-secrets build generate-build-stats]
            config:
                - builds/releng_sub_linux_configs/64_artifact.py
                - balrog/production.py
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@ -12,7 +12,7 @@ android-api-15/debug:
        max-run-time: 7200
    run:
        using: mozharness
-        actions: [get-secrets build multi-l10n update]
+        actions: [get-secrets build generate-build-stats multi-l10n update]
        config:
            - builds/releng_base_android_64_builds.py
            - disable_signing.py
@ -36,7 +36,7 @@ android-x86/opt:
        max-run-time: 7200
    run:
        using: mozharness
-        actions: [get-secrets build multi-l10n update]
+        actions: [get-secrets build generate-build-stats multi-l10n update]
        config:
            - builds/releng_base_android_64_builds.py
            - disable_signing.py
@ -63,7 +63,7 @@ android-x86-nightly/opt:
        max-run-time: 7200
    run:
        using: mozharness
-        actions: [get-secrets build multi-l10n update]
+        actions: [get-secrets build generate-build-stats multi-l10n update]
        config:
            - builds/releng_base_android_64_builds.py
            - disable_signing.py
@ -88,7 +88,7 @@ android-api-15/opt:
        max-run-time: 7200
    run:
        using: mozharness
-        actions: [get-secrets build multi-l10n update]
+        actions: [get-secrets build generate-build-stats multi-l10n update]
        config:
            - builds/releng_base_android_64_builds.py
            - disable_signing.py
@ -115,7 +115,7 @@ android-api-15-nightly/opt:
        max-run-time: 7200
    run:
        using: mozharness
-        actions: [get-secrets build multi-l10n update]
+        actions: [get-secrets build generate-build-stats multi-l10n update]
        config:
            - builds/releng_base_android_64_builds.py
            - disable_signing.py
@ -154,7 +154,7 @@ android-api-15-gradle/opt:
            type: directory
    run:
        using: mozharness
-        actions: [get-secrets build multi-l10n update]
+        actions: [get-secrets build generate-build-stats multi-l10n update]
        config:
            - builds/releng_base_android_64_builds.py
            - disable_signing.py
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@ -12,7 +12,7 @@ linux64/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -36,7 +36,7 @@ linux64/pgo:
    coalesce-name: linux64-pgo
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        options: [enable-pgo]
        config:
            - builds/releng_base_linux_64_builds.py
@ -60,7 +60,7 @@ linux64/debug:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -87,7 +87,7 @@ linux64-devedition-nightly/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - disable_signing.py
@ -114,7 +114,7 @@ linux/opt:
    coalesce-name: opt_linux32
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_32_builds.py
            - balrog/production.py
@ -138,7 +138,7 @@ linux/debug:
    coalesce-name: dbg_linux32
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_32_builds.py
            - balrog/production.py
@ -163,7 +163,7 @@ linux/pgo:
    coalesce-name: linux32-pgo
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        options: [enable-pgo]
        config:
            - builds/releng_base_linux_32_builds.py
@ -190,7 +190,7 @@ linux-devedition-nightly/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_32_builds.py
            - disable_signing.py
@ -219,7 +219,7 @@ linux-nightly/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_32_builds.py
            - disable_signing.py
@ -244,7 +244,7 @@ linux64-asan/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -268,7 +268,7 @@ linux64-asan/debug:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -295,7 +295,7 @@ linux64-nightly/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - disable_signing.py
@ -320,7 +320,7 @@ linux64-stylo/opt:
        max-run-time: 3600
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -345,7 +345,7 @@ linux64-stylo/debug:
        max-run-time: 3600
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -371,7 +371,7 @@ linux64-jsdcov/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -397,7 +397,7 @@ linux64-ccov/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -422,7 +422,7 @@ linux64-add-on-devel/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -448,7 +448,7 @@ linux64-qr/debug:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -474,7 +474,7 @@ linux64-qr/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_64_builds.py
            - balrog/production.py
@ -500,7 +500,7 @@ linux-qr/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_32_builds.py
            - balrog/production.py
@ -527,7 +527,7 @@ linux-qr/debug:
    coalesce-name: dbg_linux32
    run:
        using: mozharness
-        actions: [get-secrets build check-test update]
+        actions: [get-secrets build generate-build-stats check-test update]
        config:
            - builds/releng_base_linux_32_builds.py
            - balrog/production.py
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@ -13,7 +13,7 @@ macosx64/debug:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build update]
+        actions: [get-secrets build generate-build-stats update]
        config:
            - builds/releng_base_mac_64_cross_builds.py
            - balrog/production.py
@ -36,7 +36,7 @@ macosx64/opt:
        implementation: buildbot-bridge
    run:
        using: mozharness
-        actions: [get-secrets build update]
+        actions: [get-secrets build generate-build-stats update]
        config:
            - builds/releng_base_mac_64_builds.py
            - balrog/production.py
@ -59,7 +59,7 @@ macosx64-qr/debug:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build update]
+        actions: [get-secrets build generate-build-stats update]
        config:
            - builds/releng_base_mac_64_cross_builds.py
            - balrog/production.py
@ -84,7 +84,7 @@ macosx64-qr/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build update]
+        actions: [get-secrets build generate-build-stats update]
        config:
            - builds/releng_base_mac_64_cross_builds.py
            - balrog/production.py
@ -109,7 +109,7 @@ macosx64-add-on-devel/opt:
        max-run-time: 36000
    run:
       using: mozharness
-       actions: [get-secrets build update]
+       actions: [get-secrets build generate-build-stats update]
       config:
            - builds/releng_base_mac_64_cross_builds.py
            - balrog/production.py
@ -137,7 +137,7 @@ macosx64-nightly/opt:
        max-run-time: 36000
    run:
        using: mozharness
-        actions: [get-secrets build update]
+        actions: [get-secrets build generate-build-stats update]
        config:
            - builds/releng_base_mac_64_cross_builds.py
            - disable_signing.py
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@ -31,7 +31,7 @@ jobs:
            max-run-time: 36000
        run:
            using: mozharness
-            actions: [build update]
+            actions: [build generate-build-stats update]
            config:
                - builds/releng_base_mac_64_cross_builds.py
                - balrog/production.py
@ -54,7 +54,7 @@ jobs:
            max-run-time: 36000
        run:
            using: mozharness
-            actions: [build update]
+            actions: [build generate-build-stats update]
            config:
                - builds/releng_base_mac_64_cross_builds.py
                - balrog/production.py
@ -77,7 +77,7 @@ jobs:
            max-run-time: 36000
        run:
            using: mozharness
-            actions: [build]
+            actions: [build generate-build-stats]
            config:
                - builds/releng_sub_linux_configs/64_stat_and_debug.py
                - balrog/production.py
@ -98,7 +98,7 @@ jobs:
            max-run-time: 36000
        run:
            using: mozharness
-            actions: [build]
+            actions: [build generate-build-stats]
            config:
                - builds/releng_sub_linux_configs/64_stat_and_opt.py
                - balrog/production.py
--- a/taskcluster/ci/valgrind/kind.yml
+++ b/taskcluster/ci/valgrind/kind.yml
@ -27,7 +27,7 @@ jobs:
            max-run-time: 72000
        run:
            using: mozharness
-            actions: [get-secrets build valgrind-test]
+            actions: [get-secrets build generate-build-stats valgrind-test]
            custom-build-variant-cfg: valgrind
            config:
                - builds/releng_base_linux_64_builds.py
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@ -11,6 +11,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'multi-l10n',
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@ -15,6 +15,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@ -14,6 +14,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
@ -11,6 +11,7 @@ config = {
        # 'setup-mock',
        'checkout-sources',
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@ -11,6 +11,7 @@ config = {
        'clone-tools',
        'checkout-sources',
        'build',
+        'generate-build-stats',
        'update',  # decided by query_is_nightly()
    ],
    "buildbot_json_path": "buildprops.json",
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@ -15,6 +15,7 @@ config = {
        'checkout-sources',
        # 'setup-mock', windows do not use mock
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@ -15,6 +15,7 @@ config = {
        'checkout-sources',
        # 'setup-mock', windows do not use mock
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_qr_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_qr_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
@ -7,6 +7,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
 #        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
@ -8,6 +8,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'sendchange',
    ],
    "buildbot_json_path": "buildprops.json",
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
@ -10,6 +10,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'sendchange',
    ],
    "buildbot_json_path": "buildprops.json",
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_qr_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_qr_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
@ -8,6 +8,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
    ],
    "buildbot_json_path": "buildprops.json",
    'exes': {
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
@ -8,6 +8,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
    ],
    "buildbot_json_path": "buildprops.json",
    'exes': {
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stylo.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stylo.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stylo_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stylo_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        #'setup-mock',
        'build',
+        # 'generate-build-stats',
        #'upload-files',
        #'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
@ -7,6 +7,7 @@ config = {
        'checkout-sources',
 #        'setup-mock',
        'build',
+#        'generate-build-stats',
        'upload-files',
 #        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        # 'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'update',  # decided by query_is_nightly()
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_qr_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_qr_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        # 'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'update',  # decided by query_is_nightly()
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        # 'setup-mock',
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        # 'setup-mock',
        'build',
+        # 'generate-build-stats',
        'upload-files',
        'sendchange',
        'update',  # decided by query_is_nightly()
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
@ -7,6 +7,7 @@ config = {
        'checkout-sources',
        # 'setup-mock', windows do not use mock
        'build',
+#        'generate-build-stats',
        'upload-files',
 #        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        # 'setup-mock', windows do not use mock
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        # 'setup-mock', windows do not use mock
        'build',
+        # 'generate-build-stats',
        'update',  # decided by query_is_nightly()
    ],
    'stage_platform': 'win32-st-an-debug',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
@ -7,6 +7,7 @@ config = {
        'checkout-sources',
        # 'setup-mock', windows do not use mock
        'build',
+#        'generate-build-stats',
        'upload-files',
 #        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
@ -9,6 +9,7 @@ config = {
        'checkout-sources',
        # 'setup-mock', windows do not use mock
        'build',
+        'generate-build-stats',
        'upload-files',
        'sendchange',
        'check-test',
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_debug.py
@ -19,6 +19,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_opt.py
@ -19,6 +19,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py
@ -19,6 +19,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py
@ -19,6 +19,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
@ -19,6 +19,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py
@ -20,6 +20,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py
@ -19,6 +19,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
@ -19,6 +19,7 @@ config = {
    'default_actions': [
        'clone-tools',
        'build',
+        'generate-build-stats',
        'check-test',
    ],
    'exes': {
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@ -1649,9 +1649,6 @@ or run without that action (ie: --no-{action})"
            self.fatal("'mach build' did not run successfully. Please check "
                       "log for errors.")

-        self.generate_build_props(console_output=True, halt_on_failure=True)
-        self._generate_build_stats()
-
    def multi_l10n(self):
        if not self.query_is_nightly():
            self.info("Not a nightly build, skipping multi l10n.")
@ -1745,8 +1742,10 @@ or run without that action (ie: --no-{action})"
        self._taskcluster_upload(abs_files, self.routes_json['l10n'],
                                 locale='multi')

-    def postflight_build(self):
+    def postflight_build(self, console_output=True):
        """grabs properties from post build and calls ccache -s"""
+        self.generate_build_props(console_output=console_output,
+                                  halt_on_failure=True)
        if self.config.get('enable_ccache'):
            self._ccache_s()

@ -1927,15 +1926,13 @@ or run without that action (ie: --no-{action})"
            'subtests': [],
        }

-    def _generate_build_stats(self):
+    def generate_build_stats(self):
        """grab build stats following a compile.

        This action handles all statistics from a build: 'count_ctors'
        and then posts to graph server the results.
        We only post to graph server for non nightly build
        """
-        self.info('Collecting build metrics')
-
        if self.config.get('forced_artifact_build'):
            self.info('Skipping due to forced artifact build.')
            return
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@ -39,6 +39,7 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object):
                'checkout-sources',
                'setup-mock',
                'build',
+                'generate-build-stats',
                'upload-files',  # upload from BB to TC
                'sendchange',
                'check-test',