# HG changeset patch # User Tom Prince # Date 1517460476 25200 # Wed Jan 31 21:47:56 2018 -0700 # Node ID ee3ea2965a24731fb8fcf7ba988c815d45ef783b # Parent d4323d6d01d074815508c0505f7bf50ff7dbebcb 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 diff --git a/testing/mozharness/configs/builds/branch_specifics.py b/testing/mozharness/configs/builds/branch_specifics.py --- a/testing/mozharness/configs/builds/branch_specifics.py +++ b/testing/mozharness/configs/builds/branch_specifics.py @@ -7,17 +7,16 @@ # example config and explanation of how it works: # config = { # # if a branch matches a key below, override items in self.config with # # items in the key's value. # # this override can be done for every platform or at a platform level # '': { # # global config items (applies to all platforms and build types) # 'repo_path': "projects/", -# 'graph_server_branch_name': "Firefox", # # # platform config items (applies to specific platforms) # 'platform_overrides': { # # if a platform matches a key below, override items in # # self.config with items in the key's value # 'linux64-debug': { # 'upload_symbols': False, # }, @@ -28,33 +27,30 @@ # }, # } config = { ### release branches "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", }, 'android-x86-old-id': { "update_channel": "nightly-old-id", }, } }, 'mozilla-release': { 'enable_release_promotion': True, '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', 'force_clobber': True, }, 'linux64': { 'mozconfig_variant': 'release', 'force_clobber': True, @@ -118,17 +114,16 @@ config = { }, }, }, 'mozilla-beta': { 'enable_release_promotion': 1, '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', 'force_clobber': True, }, 'linux64': { 'mozconfig_variant': 'beta', 'force_clobber': True, @@ -206,88 +201,66 @@ config = { 'update_channel': 'default', }, }, }, 'mozilla-aurora': { '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, }, ### project branches #'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", }, 'android-x86-old-id': { "update_channel": "nightly-old-id", }, } }, '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', 'enable_release_promotion': 1, 'platform_overrides': { 'linux': { 'mozconfig_variant': 'release', }, @@ -347,21 +320,14 @@ config = { }, 'win32-devedition': { "update_channel": "aurora", }, 'win64-devedition': { "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': {}, } diff --git a/testing/mozharness/configs/builds/build_pool_specifics.py b/testing/mozharness/configs/builds/build_pool_specifics.py --- a/testing/mozharness/configs/builds/build_pool_specifics.py +++ b/testing/mozharness/configs/builds/build_pool_specifics.py @@ -1,39 +1,13 @@ # this is a dict of pool specific keys/values. As this fills up and more # 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/', 'upload_env': { 'UPLOAD_HOST': 'localhost', 'UPLOAD_PATH': '/builds/worker/artifacts', }, }, diff --git a/testing/mozharness/configs/builds/releng_base_android_64_builds.py b/testing/mozharness/configs/builds/releng_base_android_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 @@ -44,36 +44,28 @@ config = { 'multi_locale': True, ######################################################################### ######################################################################### 'base_name': 'Android 2.3 %(branch)s', 'platform': 'android', 'stage_platform': 'android', - 'post_upload_include_platform': True, 'enable_max_vsize': False, 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', 'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache', 'TOOLTOOL_HOME': '/builds', 'LC_ALL': 'C', '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', }, 'src_mozconfig': 'mobile/android/config/mozconfigs/android/nightly', ######################################################################### } diff --git a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py --- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py +++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py @@ -54,23 +54,16 @@ config = { 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'LC_ALL': 'C', # 32 bit specific 'PATH': '/usr/local/bin:/usr/lib/ccache:\ /bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:\ /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', }, 'mozconfig_platform': 'linux32', 'mozconfig_variant': 'nightly', ######################################################################### } diff --git a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py --- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py +++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py @@ -54,23 +54,16 @@ config = { 'LC_ALL': 'C', ## 64 bit specific 'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\ /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\ /tools/python27-mercurial/bin:/home/cltbld/bin', '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', }, 'mozconfig_platform': 'linux64', 'mozconfig_variant': 'nightly', ######################################################################### } diff --git a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py --- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py +++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py @@ -43,23 +43,16 @@ config = { 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'LC_ALL': 'C', ## 64 bit specific 'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\ /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\ /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', }, 'mozconfig_platform': 'macosx64', 'mozconfig_variant': 'nightly', 'artifact_flag_build_variant_in_try': 'cross-artifact', ######################################################################### diff --git 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 --- 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 @@ -4,17 +4,16 @@ config = { 'default_actions': [ 'clobber', 'build', 'check-test', # 'update', ], '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': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', 'TOOLTOOL_CACHE': '/builds/tooltool_cache', diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py @@ -4,17 +4,16 @@ config = { 'default_actions': [ 'clobber', 'build', 'check-test', # 'update', ], 'stage_platform': 'linux64-asan', 'build_type': 'asan', - 'platform_supports_post_upload_to_latest': False, 'enable_signing': False, #### 64 bit build specific ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', diff --git 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 --- 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 @@ -5,17 +5,16 @@ config = { 'clobber', 'build', 'check-test', # 'update', ], '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': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', diff --git 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 --- 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 @@ -4,17 +4,16 @@ config = { 'default_actions': [ 'clobber', 'build', 'check-test', # 'update', ], 'stage_platform': 'linux64-asan', 'build_type': 'asan', - 'platform_supports_post_upload_to_latest': False, 'enable_signing': False, #### 64 bit build specific ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', diff --git 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 --- 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 @@ -5,17 +5,16 @@ config = { 'clobber', 'build', 'check-test', # 'update', ], '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': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', diff --git 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 --- 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 @@ -3,17 +3,16 @@ import os config = { 'default_actions': [ 'clobber', 'build', 'check-test', '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 ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py @@ -4,17 +4,16 @@ config = { 'default_actions': [ 'clobber', 'build', 'check-test', # 'update', ], 'stage_platform': 'linux64-fuzzing-asan', 'build_type': 'asan', - 'platform_supports_post_upload_to_latest': False, 'enable_signing': False, #### 64 bit build specific ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_AUTOMATION': '1', 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py @@ -5,17 +5,16 @@ config = { 'clobber', 'build', 'check-test', 'valgrind-test', #'update', ], '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 ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', diff --git 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 --- 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 @@ -4,17 +4,16 @@ config = { 'default_actions': [ 'clobber', 'build', 'check-test', # 'update', ], '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': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', 'TOOLTOOL_CACHE': '/builds/tooltool_cache', diff --git a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py --- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py +++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py @@ -2,17 +2,16 @@ import os config = { 'default_actions': [ 'clobber', 'build', ], 'stage_platform': 'macosx64-fuzzing-asan', 'build_type': 'asan', - 'platform_supports_post_upload_to_latest': False, 'enable_signing': False, #### 64 bit build specific ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'DISPLAY': ':2', 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', diff --git 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 --- 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 @@ -6,17 +6,16 @@ config = { 'build', 'update', # decided by query_is_nightly() ], 'debug_build': True, 'stage_platform': 'macosx64-st-an-debug', '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 ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'HG_SHARE_BASE_DIR': '/builds/hg-shared', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'TINDERBOX_OUTPUT': '1', diff --git 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 --- 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 @@ -6,17 +6,16 @@ config = { 'build', 'update', # decided by query_is_nightly() ], 'stage_platform': 'win32-st-an-debug', 'debug_build': True, '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': { 'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe', 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'MOZ_OBJDIR': '%(abs_obj_dir)s', diff --git a/testing/mozharness/configs/platform_supports_post_upload_to_latest.py b/testing/mozharness/configs/platform_supports_post_upload_to_latest.py deleted file mode 100644 --- a/testing/mozharness/configs/platform_supports_post_upload_to_latest.py +++ /dev/null @@ -1,3 +0,0 @@ -config = { - 'platform_supports_post_upload_to_latest': False, -} diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -14,17 +14,16 @@ import json import os import pprint import subprocess import time import uuid import copy import glob -from itertools import chain # import the power of mozharness ;) import sys from datetime import datetime import re from mozharness.base.config import BaseConfig, parse_config_file from mozharness.base.log import ERROR, OutputParser, FATAL from mozharness.base.script import PostScriptRun @@ -977,43 +976,24 @@ or run without that action (ie: --no-{ac def query_mach_build_env(self, multiLocale=None): c = self.config if multiLocale is None and self.query_is_nightly(): multiLocale = c.get('multi_locale', False) 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 # separate folder. if multiLocale and self.config.get('taskcluster_nightly'): 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): """determines whether a build should be run with pgo even if it is not a classified as a 'pgo build'. requirements: 1) must be a platform that can run against pgo @@ -1031,75 +1011,16 @@ or run without that action (ie: --no-{ac c = self.config dirs = self.query_abs_dirs() check_test_env = {} if c.get('check_test_env'): for env_var, env_value in c['check_test_env'].iteritems(): 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 dirs = self.query_abs_dirs() old_package_paths = [] old_package_patterns = c.get('old_packages') self.info("removing old packages...") @@ -1241,28 +1162,16 @@ or run without that action (ie: --no-{ac 'dist', 'bin', 'libxul.so') cmd = [python_path, abs_count_ctors_path, abs_libxul_path] 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' ) self.info("setting properties set by mach build. Looking in path: %s" % mach_properties_path) if os.path.exists(mach_properties_path): with self.opened(mach_properties_path, error_level=error_level) as (fh, err): diff --git a/testing/mozharness/scripts/fx_desktop_build.py b/testing/mozharness/scripts/fx_desktop_build.py --- a/testing/mozharness/scripts/fx_desktop_build.py +++ b/testing/mozharness/scripts/fx_desktop_build.py @@ -63,32 +63,24 @@ class FxDesktopBuild(BuildScript, TryToo # only used for make uploadsymbols 'old_packages': [ "%(objdir)s/dist/firefox-*", "%(objdir)s/dist/fennec*", "%(objdir)s/dist/seamonkey*", "%(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', ], 'virtualenv_path': 'venv', # }, 'ConfigClass': BuildingConfig,