# HG changeset patch # User Chris AtLee # Date 1527284143 14400 # Fri May 25 17:35:43 2018 -0400 # Node ID dab1fa529286ca14ac6da1a8c0c0f94dcf3f43cd # Parent 53577042f32469282751b0e11bb02d815006aeb9 Bug 1237182: Get rid of buildprops.json r=tomprince,sfraser Differential Revision: https://phabricator.services.mozilla.com/D1443 diff --git a/build/mozconfig.cache b/build/mozconfig.cache --- a/build/mozconfig.cache +++ b/build/mozconfig.cache @@ -2,22 +2,16 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Setup for build cache # Avoid duplication if the file happens to be included twice. if test -z "$bucket" -a -z "$NO_CACHE"; then -# buildbot (or builders that use buildprops.json): -if [ -f $topsrcdir/../buildprops.json ]; then -read branch platform master < /dev/null) -EOF - bucket= if test -z "$SCCACHE_DISABLE"; then case "${branch}" in try) case "${master}" in *scl1.mozilla.com*|*.scl3.mozilla.com*) bucket=mozilla-releng-s3-cache-us-west-1-try ;; diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -665,18 +665,17 @@ class TaskCache(CacheManager): raise ValueError('Task for {namespace} does not exist (yet)!'.format(namespace=namespace)) artifacts = list_artifacts(taskId) urls = [] for artifact_name in artifact_job.find_candidate_artifacts(artifacts): # We can easily extract the task ID from the URL. We can't easily # extract the build ID; we use the .ini files embedded in the - # downloaded artifact for this. We could also use the uploaded - # public/build/buildprops.json for this purpose. + # downloaded artifact for this. url = get_artifact_url(taskId, artifact_name) urls.append(url) if not urls: raise ValueError('Task for {namespace} existed, but no artifacts found!'.format(namespace=namespace)) return urls class ArtifactPersistLimit(PersistLimit): diff --git 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 --- 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 @@ -19,17 +19,16 @@ config = { 'env': { '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', 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;' 'C:/mozilla-build/buildbotve/scripts;' '%s' % (os.environ.get('path')), - 'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'), 'TINDERBOX_OUTPUT': '1', 'XPCOM_DEBUG_BREAK': 'stack-and-abort', 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache', 'TOOLTOOL_HOME': '/c/builds', }, 'mozconfig_variant': 'add-on-devel', ####################### } diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py @@ -19,17 +19,16 @@ config = { 'env': { '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', 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;' 'C:/mozilla-build/buildbotve/scripts;' '%s' % (os.environ.get('path')), - 'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'), 'TINDERBOX_OUTPUT': '1', 'XPCOM_DEBUG_BREAK': 'stack-and-abort', 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache', 'TOOLTOOL_HOME': '/c/builds', }, 'mozconfig_variant': 'debug', ####################### } 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 @@ -22,17 +22,16 @@ releng.manifest", 'env': { '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', 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;' 'C:/mozilla-build/buildbotve/scripts;' '%s' % (os.environ.get('path')), - 'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'), 'TINDERBOX_OUTPUT': '1', 'XPCOM_DEBUG_BREAK': 'stack-and-abort', 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache', 'TOOLTOOL_HOME': '/c/builds', }, 'mozconfig_variant': 'debug-static-analysis', 'purge_minsize': 9, 'artifact_flag_build_variant_in_try': None, diff --git 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 --- 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 @@ -18,17 +18,16 @@ config = { #### 64 bit build specific ##### 'env': { 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;' 'C:/mozilla-build/buildbotve/scripts;' '%s' % (os.environ.get('path')), - 'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'), 'TINDERBOX_OUTPUT': '1', 'XPCOM_DEBUG_BREAK': 'stack-and-abort', 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache', 'TOOLTOOL_HOME': '/c/builds', }, 'mozconfig_variant': 'add-on-devel', ####################### } diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py --- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py +++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py @@ -18,17 +18,16 @@ config = { #### 64 bit build specific ##### 'env': { 'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared', 'MOZ_CRASHREPORTER_NO_REPORT': '1', 'MOZ_OBJDIR': '%(abs_obj_dir)s', 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;' 'C:/mozilla-build/buildbotve/scripts;' '%s' % (os.environ.get('path')), - 'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'), 'TINDERBOX_OUTPUT': '1', 'XPCOM_DEBUG_BREAK': 'stack-and-abort', 'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache', 'TOOLTOOL_HOME': '/c/builds', }, 'mozconfig_variant': 'debug', ####################### } diff --git a/testing/mozharness/external_tools/gittool.py b/testing/mozharness/external_tools/gittool.py --- a/testing/mozharness/external_tools/gittool.py +++ b/testing/mozharness/external_tools/gittool.py @@ -37,17 +37,16 @@ from util.git import git if __name__ == '__main__': from optparse import OptionParser parser = OptionParser(__doc__) parser.set_defaults( revision=os.environ.get('GIT_REV'), branch=os.environ.get('GIT_BRANCH', None), - propsfile=os.environ.get('PROPERTIES_FILE'), loglevel=logging.INFO, shared_dir=os.environ.get('GIT_SHARE_BASE_DIR'), mirrors=None, clean=False, ) parser.add_option( "-r", "--rev", dest="revision", help="which revision to update to") parser.add_option(