Bug 1429603: Remove support for construct POST_UPLOAD_CMD in mozharness builds scripts; r=jlund

The upload is handled by taskcluster, which is handled by copying files around,
so remove support for specifying alternative commands.

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

--HG--
extra : rebase_source : 968249c0a308178b62af77d48e6aa307d4192e5a

taskcluster/ci/build/android-stuff.yml

@@ -31,7 +31,6 @@ android-test/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: android-test
@@ -84,7 +83,6 @@ android-lint/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: android-lint
@@ -140,7 +138,6 @@ android-checkstyle/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: android-checkstyle
@@ -192,7 +189,6 @@ android-findbugs/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: android-findbugs
@@ -239,7 +235,6 @@ android-geckoview-docs/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: android-geckoview-docs

taskcluster/ci/build/android.yml

@@ -32,7 +32,6 @@ android-api-16/debug:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-16-debug
@@ -85,7 +84,6 @@ android-x86/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: x86
@@ -143,7 +141,6 @@ android-x86-nightly/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
@@ -192,7 +189,6 @@ android-api-16/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-16
@@ -241,7 +237,6 @@ android-api-16-without-google-play-services/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-16-without-google-play-services
@@ -295,7 +290,6 @@ android-api-16-nightly/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
@@ -349,7 +343,6 @@ android-x86-old-id/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: x86-old-id
@@ -406,7 +399,6 @@ android-x86-old-id-nightly/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
@@ -456,7 +448,6 @@ android-api-16-old-id/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-16-old-id
@@ -508,7 +499,6 @@ android-api-16-old-id-nightly/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
@@ -558,7 +548,6 @@ android-api-16-gradle/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-16-gradle
@@ -605,7 +594,6 @@ android-aarch64/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: aarch64
@@ -658,7 +646,6 @@ android-aarch64-nightly/opt:
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true

testing/mozharness/configs/builds/branch_specifics.py

@@ -12,7 +12,6 @@
 #     '<branch-name>': {
 #         # global config items (applies to all platforms and build types)
 #         'repo_path': "projects/<branch-name>",
-#         'graph_server_branch_name': "Firefox",
 #
 #         # platform config items (applies to specific platforms)
 #         'platform_overrides': {
@@ -33,8 +32,6 @@ config = {
     "mozilla-central": {
         "repo_path": 'mozilla-central',
         "update_channel": "nightly",
-        "graph_server_branch_name": "Firefox",
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
         'platform_overrides': {
             'android-api-16-old-id': {
                 "update_channel": "nightly-old-id",
@@ -49,7 +46,6 @@ config = {
         'repo_path': 'releases/mozilla-release',
         'update_channel': 'release',
         'branch_uses_per_checkin_strategy': True,
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
         'platform_overrides': {
             'linux': {
                 'mozconfig_variant': 'release',
@@ -123,7 +119,6 @@ config = {
         'repo_path': 'releases/mozilla-beta',
         'update_channel': 'beta',
         'branch_uses_per_checkin_strategy': True,
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
         'platform_overrides': {
             'linux': {
                 'mozconfig_variant': 'beta',
@@ -211,17 +206,9 @@ config = {
         'repo_path': 'releases/mozilla-aurora',
         'update_channel': 'aurora',
         'branch_uses_per_checkin_strategy': True,
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'try': {
         'repo_path': 'try',
-        'tinderbox_build_dir': '%(who)s-%(got_revision)s',
-        'to_tinderbox_dated': False,
-        'include_post_upload_builddir': True,
-        'release_to_try_builds': True,
-        'stage_server': 'upload.trybld.productdelivery.prod.mozaws.net',
-        'stage_username': 'trybld',
-        'stage_ssh_key': 'trybld_dsa',
         'branch_supports_uploadsymbols': False,
         'use_clobberer': False,
     },
@@ -230,23 +217,16 @@ config = {
     #'fx-team': {},   #Bug 1296396
     'gum': {
         'branch_uses_per_checkin_strategy': True,
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'autoland': {
         'repo_path': 'integration/autoland',
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
-    'ux': {
-        "graph_server_branch_name": "UX",
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
+    'ux': {},
     'date': {
         'update_channel': 'nightly-date',
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
         'platform_overrides': {
             'android-api-16-old-id': {
                 "update_channel": "nightly-old-id",
@@ -259,30 +239,17 @@ config = {
     'cypress': {
         # bug 1164935
         'branch_uses_per_checkin_strategy': True,
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
 
     ### other branches that do not require anything special:
-    'alder': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
-    'ash': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
-    'birch': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
+    'alder': {},
+    'ash': {},
+    'birch': {},
     # 'build-system': {}
-    'cedar': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
-    'elm': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
+    'cedar': {},
+    'elm': {},
     'fig': {},
-    'graphics': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
+    'graphics': {},
     # 'holly': {},
     'jamun': {
         'update_channel': 'beta',
@@ -352,16 +319,9 @@ config = {
                 "update_channel": "aurora",
             },
         },
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
-    'larch': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
+    'larch': {},
     # 'maple': {},
-    'oak': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
-    'pine': {
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
+    'oak': {},
+    'pine': {},
 }

testing/mozharness/configs/builds/build_pool_specifics.py

@@ -2,33 +2,7 @@
 # fx build factories are ported, we might deal with this differently
 
 config = {
-    "staging": {
-        # if not clobberer_url, only clobber 'abs_work_dir'
-        # if true: possibly clobber, clobberer
-        # see PurgeMixin for clobber() conditions
-        'clobberer_url': 'https://api-pub-build.allizom.org/clobberer/lastclobber',
-        # staging we should use MozillaTest
-        # but in production we let the self.branch decide via
-        # self._query_graph_server_branch_name()
-        "graph_server_branch_name": "MozillaTest",
-        'graph_server': 'graphs.allizom.org',
-        'stage_server': 'upload.ffxbld.productdelivery.stage.mozaws.net',
-        'post_upload_extra': ['--bucket-prefix', 'net-mozaws-stage-delivery',
-                              '--url-prefix', 'http://ftp.stage.mozaws.net/',
-                              ],
-    },
-    "production": {
-        # if not clobberer_url, only clobber 'abs_work_dir'
-        # if true: possibly clobber, clobberer
-        # see PurgeMixin for clobber() conditions
-        'clobberer_url': 'https://api.pub.build.mozilla.org/clobberer/lastclobber',
-        'graph_server': 'graphs.mozilla.org',
-        # bug 1216907, set this at branch level
-        # 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-    },
     "taskcluster": {
-        'graph_server': 'graphs.mozilla.org',
-        'stage_server': 'ignored',
         # use the relengapi proxy to talk to tooltool
         "tooltool_servers": ['http://relengapi/tooltool/'],
         "tooltool_url": 'http://relengapi/tooltool/',

testing/mozharness/configs/builds/releng_base_android_64_builds.py

@@ -60,8 +60,6 @@ config = {
     'base_name': 'Android 2.3 %(branch)s',
     'platform': 'android',
     'stage_platform': 'android',
-    'stage_product': 'mobile',
-    'post_upload_include_platform': True,
     'enable_max_vsize': False,
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
@@ -75,13 +73,6 @@ config = {
         'PATH': '/usr/local/bin:/bin:/usr/bin',
         'SHIP_LICENSED_FONTS': '1',
     },
-    'upload_env': {
-        # stage_server is dictated from build_pool_specifics.py
-        'UPLOAD_HOST': '%(stage_server)s',
-        'UPLOAD_USER': '%(stage_username)s',
-        'UPLOAD_SSH_KEY': '/home/mock_mozilla/.ssh/%(stage_ssh_key)s',
-        'UPLOAD_TO_TEMP': '1',
-    },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',

testing/mozharness/configs/builds/releng_base_linux_32_builds.py

@@ -59,13 +59,6 @@ config = {
 /tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib",
     },
-    'upload_env': {
-        # stage_server is dictated from build_pool_specifics.py
-        'UPLOAD_HOST': '%(stage_server)s',
-        'UPLOAD_USER': '%(stage_username)s',
-        'UPLOAD_SSH_KEY': '/home/mock_mozilla/.ssh/%(stage_ssh_key)s',
-        'UPLOAD_TO_TEMP': '1',
-    },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',

testing/mozharness/configs/builds/releng_base_linux_64_builds.py

@@ -59,13 +59,6 @@ config = {
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib64",
         ##
     },
-    'upload_env': {
-        # stage_server is dictated from build_pool_specifics.py
-        'UPLOAD_HOST': '%(stage_server)s',
-        'UPLOAD_USER': '%(stage_username)s',
-        'UPLOAD_SSH_KEY': '/home/mock_mozilla/.ssh/%(stage_ssh_key)s',
-        'UPLOAD_TO_TEMP': '1',
-    },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux64/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',

testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py

@@ -48,13 +48,6 @@ config = {
 /tools/python27-mercurial/bin:/home/cltbld/bin',
         ##
     },
-    'upload_env': {
-        # stage_server is dictated from build_pool_specifics.py
-        'UPLOAD_HOST': '%(stage_server)s',
-        'UPLOAD_USER': '%(stage_username)s',
-        'UPLOAD_SSH_KEY': '/Users/cltbld/.ssh/%(stage_ssh_key)s',
-        'UPLOAD_TO_TEMP': '1',
-    },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux64/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',

testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py

@@ -49,13 +49,6 @@ config = {
         # 32 bit specific
         'PATH': '/usr/local/bin:/bin:/usr/bin',
     },
-    'upload_env': {
-        # stage_server is dictated from build_pool_specifics.py
-        'UPLOAD_HOST': '%(stage_server)s',
-        'UPLOAD_USER': '%(stage_username)s',
-        'UPLOAD_SSH_KEY': '/home/mock_mozilla/.ssh/%(stage_ssh_key)s',
-        'UPLOAD_TO_TEMP': '1',
-    },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',

testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py

@@ -9,7 +9,6 @@ config = {
     ],
     'stage_platform': 'linux64-add-on-devel',
     'build_type': 'add-on-devel',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py

@@ -9,7 +9,6 @@ config = {
     ],
     'stage_platform': 'linux64-asan',
     'build_type': 'asan',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py

@@ -10,7 +10,6 @@ config = {
     'stage_platform': 'linux64-asan-debug',
     'build_type': 'asan-debug',
     'debug_build': True,
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py

@@ -9,7 +9,6 @@ config = {
     ],
     'stage_platform': 'linux64-asan-reporter',
     'build_type': 'asan',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py

@@ -9,7 +9,6 @@ config = {
     ],
     'stage_platform': 'linux64-asan',
     'build_type': 'asan',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py

@@ -10,7 +10,6 @@ config = {
     'stage_platform': 'linux64-asan-debug',
     'build_type': 'asan-debug',
     'debug_build': True,
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage.py

@@ -8,7 +8,6 @@ config = {
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'linux64-ccov',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_count_ctors': False,
     #### 64 bit build specific #####

testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py

@@ -9,7 +9,6 @@ config = {
     ],
     'stage_platform': 'linux64-fuzzing-asan',
     'build_type': 'asan',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py

@@ -8,7 +8,6 @@ config = {
     ],
     'stage_platform': 'linux64-fuzzing-debug',
     'debug_build': True,
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py

@@ -10,7 +10,6 @@ config = {
     ],
     'stage_platform': 'linux64-valgrind',
     'build_type': 'valgrind',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'perfherder_extra_options': ['valgrind'],
     #### 64 bit build specific #####

testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py

@@ -9,7 +9,6 @@ config = {
     ],
     'stage_platform': 'macosx64-add-on-devel',
     'build_type': 'add-on-devel',
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     #### 64 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_mac_configs/64_devedition.py

@@ -2,6 +2,5 @@ config = {
     'mozconfig_variant': 'devedition',
     'force_clobber': True,
     'stage_platform': 'macosx64-devedition',
-    'stage_product': 'devedition',
 
 }

testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py

@@ -11,7 +11,6 @@ config = {
     'build_type': 'st-an-debug',
     'tooltool_manifest_src': "browser/config/tooltool-manifests/macosx64/\
 clang.manifest",
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'perfherder_extra_options': ['static-analysis'],
     #### 64 bit build specific #####

testing/mozharness/configs/builds/releng_sub_windows_configs/32_devedition.py

@@ -2,5 +2,4 @@ config = {
     'mozconfig_variant': 'devedition',
     'force_clobber': True,
     'stage_platform': 'win32-devedition',
-    'stage_product': 'devedition',
 }

testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py

@@ -11,7 +11,6 @@ config = {
     'enable_signing': False,
     'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/\
 releng.manifest",
-    'platform_supports_post_upload_to_latest': False,
     'perfherder_extra_options': ['static-analysis'],
     #### 32 bit build specific #####
     'env': {

testing/mozharness/configs/builds/releng_sub_windows_configs/64_devedition.py

@@ -2,5 +2,4 @@ config = {
     'mozconfig_variant': 'devedition',
     'force_clobber': True,
     'stage_platform': 'win64-devedition',
-    'stage_product': 'devedition',
 }

testing/mozharness/configs/platform_supports_post_upload_to_latest.py

@@ -1,3 +0,0 @@
-config = {
-    'platform_supports_post_upload_to_latest': False,
-}

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

@@ -19,7 +19,6 @@ import time
 import uuid
 import copy
 import glob
-from itertools import chain
 
 # import the power of mozharness ;)
 import sys
@@ -988,18 +987,6 @@ or run without that action (ie: --no-{action})"
         mach_env = {}
         if c.get('upload_env'):
             mach_env.update(c['upload_env'])
-            if 'UPLOAD_HOST' in mach_env and 'stage_server' in c:
-                mach_env['UPLOAD_HOST'] = mach_env['UPLOAD_HOST'] % {
-                    'stage_server': c['stage_server']
-                }
-            if 'UPLOAD_USER' in mach_env and 'stage_username' in c:
-                mach_env['UPLOAD_USER'] = mach_env['UPLOAD_USER'] % {
-                    'stage_username': c['stage_username']
-                }
-            if 'UPLOAD_SSH_KEY' in mach_env and 'stage_ssh_key' in c:
-                mach_env['UPLOAD_SSH_KEY'] = mach_env['UPLOAD_SSH_KEY'] % {
-                    'stage_ssh_key': c['stage_ssh_key']
-                }
 
         # this prevents taskcluster from overwriting the target files with
         # the multilocale files. Put everything from the en-US build in a
@@ -1008,13 +995,6 @@ or run without that action (ie: --no-{action})"
             if 'UPLOAD_PATH' in mach_env:
                 mach_env['UPLOAD_PATH'] = os.path.join(mach_env['UPLOAD_PATH'],
                                                        'en-US')
-
-        # _query_post_upload_cmd returns a list (a cmd list), for env sake here
-        # let's make it a string
-        if c.get('is_automation'):
-            pst_up_cmd = ' '.join([str(i) for i in self._query_post_upload_cmd(multiLocale)])
-            mach_env['POST_UPLOAD_CMD'] = pst_up_cmd
-
         return mach_env
 
     def _compile_against_pgo(self):
@@ -1042,65 +1022,6 @@ or run without that action (ie: --no-{action})"
                 check_test_env[env_var] = env_value % dirs
         return check_test_env
 
-    def _query_post_upload_cmd(self, multiLocale):
-        c = self.config
-        post_upload_cmd = ["post_upload.py"]
-        buildid = self.query_buildid()
-        revision = self.query_revision()
-        platform = self.stage_platform
-        who = self.query_who()
-        if c.get('pgo_build'):
-            platform += '-pgo'
-
-        if c.get('tinderbox_build_dir'):
-            # TODO find out if we should fail here like we are
-            if not who and not revision:
-                self.fatal("post upload failed. --tinderbox-builds-dir could "
-                           "not be determined. 'who' and/or 'revision' unknown")
-            # branches like try will use 'tinderbox_build_dir
-            tinderbox_build_dir = c['tinderbox_build_dir'] % {
-                'who': who,
-                'got_revision': revision
-            }
-        else:
-            # the default
-            tinderbox_build_dir = "%s-%s" % (self.branch, platform)
-
-        if who and self.branch == 'try':
-            post_upload_cmd.extend(["--who", who])
-        if c.get('include_post_upload_builddir'):
-            post_upload_cmd.extend(
-                ["--builddir", "%s-%s" % (self.branch, platform)]
-            )
-        elif multiLocale:
-            # Android builds with multilocale enabled upload the en-US builds
-            # to an en-US subdirectory, and the multilocale builds to the
-            # top-level directory.
-            post_upload_cmd.extend(
-                ["--builddir", "en-US"]
-            )
-
-        post_upload_cmd.extend(["--tinderbox-builds-dir", tinderbox_build_dir])
-        post_upload_cmd.extend(["-p", c['stage_product']])
-        post_upload_cmd.extend(['-i', buildid])
-        if revision:
-            post_upload_cmd.extend(['--revision', revision])
-        if c.get('to_tinderbox_dated'):
-            post_upload_cmd.append('--release-to-tinderbox-dated-builds')
-        if c.get('release_to_try_builds'):
-            post_upload_cmd.append('--release-to-try-builds')
-        if self.query_is_nightly():
-            if c.get('post_upload_include_platform'):
-                post_upload_cmd.extend(['-b', '%s-%s' % (self.branch, platform)])
-            else:
-                post_upload_cmd.extend(['-b', self.branch])
-            post_upload_cmd.append('--release-to-dated')
-            if c['platform_supports_post_upload_to_latest']:
-                post_upload_cmd.append('--release-to-latest')
-        post_upload_cmd.extend(c.get('post_upload_extra', []))
-
-        return post_upload_cmd
-
     def _rm_old_package(self):
         """rm the old package."""
         c = self.config
@@ -1252,18 +1173,6 @@ or run without that action (ie: --no-{action})"
         self.get_output_from_command(cmd, cwd=dirs['abs_src_dir'],
                                      throw_exception=True)
 
-    def _generate_properties_file(self, path):
-        # TODO it would be better to grab all the properties that were
-        # persisted to file rather than use whats in the buildbot_properties
-        # live object so we become less action dependant.
-        all_current_props = dict(
-            chain(self.buildbot_config['properties'].items(),
-                  self.buildbot_properties.items())
-        )
-        # graph_server_post.py expects a file with 'properties' key
-        graph_props = dict(properties=all_current_props)
-        self.dump_config(path, graph_props)
-
     def _query_props_set_by_mach(self, console_output=True, error_level=FATAL):
         mach_properties_path = os.path.join(
             self.query_abs_dirs()['abs_obj_dir'], 'dist', 'mach_build_properties.json'

testing/mozharness/scripts/fx_desktop_build.py

@@ -68,22 +68,14 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object):
                     "%(objdir)s/dist/thunderbird*",
                     "%(objdir)s/dist/install/sea/*.exe"
                 ],
-                'stage_product': 'firefox',
-                'platform_supports_post_upload_to_latest': True,
                 'build_resources_path': '%(abs_obj_dir)s/.mozbuild/build_resources.json',
                 'nightly_promotion_branches': ['mozilla-central', 'mozilla-aurora'],
 
                 # try will overwrite these
                 'clone_with_purge': False,
                 'clone_by_revision': False,
-                'tinderbox_build_dir': None,
-                'to_tinderbox_dated': True,
-                'release_to_try_builds': False,
-                'include_post_upload_builddir': False,
                 'use_clobberer': True,
 
-                'stage_username': 'ffxbld',
-                'stage_ssh_key': 'ffxbld_rsa',
                 'virtualenv_modules': [
                     'requests==2.8.1',
                 ],