Bug 1237182: Get rid of buildprops.json r=tomprince,sfraser
authorChris AtLee <catlee@mozilla.com>
Fri, 25 May 2018 17:35:43 -0400
changeset 420914 dab1fa529286ca14ac6da1a8c0c0f94dcf3f43cd
parent 420913 09b83c6b28ed0f9bc32e35182592aace627e3019
child 420915 de5086b44a78e9e37a5f88fe19ce235b324d6303
push id34083
push userapavel@mozilla.com
push dateSat, 02 Jun 2018 23:03:25 +0000
treeherdermozilla-central@1f62ecdf59b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince, sfraser
bugs1237182
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1237182: Get rid of buildprops.json r=tomprince,sfraser Differential Revision: https://phabricator.services.mozilla.com/D1443
build/mozconfig.cache
python/mozbuild/mozbuild/artifacts.py
taskcluster/docker/android-build/Dockerfile
taskcluster/docker/debian7-build/Dockerfile
taskcluster/docker/desktop1604-test/buildprops.json
taskcluster/docker/mingw32-build/Dockerfile
taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
taskcluster/docker/recipes/buildprops.json
testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
testing/mozharness/external_tools/gittool.py
--- 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 <<EOF
-$(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /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
             ;;
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -663,18 +663,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):
--- a/taskcluster/docker/android-build/Dockerfile
+++ b/taskcluster/docker/android-build/Dockerfile
@@ -43,22 +43,16 @@ COPY topsrcdir/taskcluster/docker/recipe
 
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.
 # %include taskcluster/docker/recipes/oauth.txt
 COPY topsrcdir/taskcluster/docker/recipes/oauth.txt /builds/worker/
 
-# Add a stubbed out buildprops, which keeps mozharness from choking.
-# Note that this needs to be in the parent of the workspace directory and in
-# the directory where mozharness is run (not its --work-dir).
-# %include taskcluster/docker/recipes/buildprops.json
-COPY topsrcdir/taskcluster/docker/recipes/buildprops.json /builds/worker/
-
 # Reset user/workdir from parent image so we can install software.
 WORKDIR /
 USER root
 
 # Install Sonatype Nexus.  Cribbed directly from
 # https://github.com/sonatype/docker-nexus/blob/fffd2c61b2368292040910c055cf690c8e76a272/oss/Dockerfile.
 
 # Observe missing --no-install-recommends, in order to install glib2.0/gconf/etc.
--- a/taskcluster/docker/debian7-build/Dockerfile
+++ b/taskcluster/docker/debian7-build/Dockerfile
@@ -62,14 +62,8 @@ RUN apt-get update && \
 COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
 
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.
 # %include taskcluster/docker/recipes/oauth.txt
 COPY topsrcdir/taskcluster/docker/recipes/oauth.txt /builds/worker/
-
-# stubbed out buildprops, which keeps mozharness from choking
-# Note that this needs to be in the parent of the workspace directory and in
-# the directory where mozharness is run (not its --work-dir)
-# %include taskcluster/docker/recipes/buildprops.json
-COPY topsrcdir/taskcluster/docker/recipes/buildprops.json /builds/worker/
deleted file mode 100644
--- a/taskcluster/docker/desktop1604-test/buildprops.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "properties": {
-    "buildername": ""
-  },
-  "sourcestamp": {
-    "changes": []
-  }
-}
--- a/taskcluster/docker/mingw32-build/Dockerfile
+++ b/taskcluster/docker/mingw32-build/Dockerfile
@@ -41,14 +41,8 @@ RUN apt-get update && \
       libx11-dev:i386
 
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.
 # %include taskcluster/docker/recipes/oauth.txt
 COPY topsrcdir/taskcluster/docker/recipes/oauth.txt /builds/worker/
-
-# stubbed out buildprops, which keeps mozharness from choking
-# Note that this needs to be in the parent of the workspace directory and in
-# the directory where mozharness is run (not its --work-dir)
-# %include taskcluster/docker/recipes/buildprops.json
-COPY topsrcdir/taskcluster/docker/recipes/buildprops.json /builds/worker/
--- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
+++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
@@ -34,17 +34,16 @@ APP_ID=''
 APP_NAME=''
 HGHOST="hg.mozilla.org"
 STAGEHOST="archive.mozilla.org"
 WGET="wget -nv"
 UNZIP="unzip -q"
 DIFF="$(which diff) -u"
 BASEDIR="${HOME}"
 TOOLSDIR="${HOME}/tools"
-HGTOOL="${TOOLSDIR}/buildfarm/utils/hgtool.py"
 
 SCRIPTDIR="$(realpath "$(dirname "$0")")"
 HG="$(which hg)"
 DATADIR="${BASEDIR}/data"
 mkdir -p "${DATADIR}"
 
 VERSION=''
 MCVERSION=''
@@ -346,30 +345,21 @@ function compare_remote_settings_files {
 }
 
 function clone_build_tools {
     rm -fr "${TOOLSDIR}"
     CLONE_CMD="${HG} clone https://hg.mozilla.org/build/tools ${TOOLSDIR}"
     ${CLONE_CMD}
 }
 
-# Clones an hg repo, using hgtool preferentially.
+# Clones an hg repo
 function clone_repo {
   cd "${BASEDIR}"
   if [ ! -d "${REPODIR}" ]; then
-    CLONE_CMD=""
-    if [ -f "${HGTOOL}" ]; then
-      # Need to pass the default branch here to avoid pollution from buildprops.json
-      # when hgtool.py is run in production.
-      CLONE_CMD="${HGTOOL} --branch default"
-    else
-      echo "INFO: hgtool.py not found. Falling back to vanilla hg."
-      CLONE_CMD="${HG} clone"
-    fi
-    CLONE_CMD="${CLONE_CMD} ${HGREPO} ${REPODIR}"
+    CLONE_CMD="${HG} clone ${HGREPO} ${REPODIR}"
     ${CLONE_CMD}
   fi
 
   ${HG} -R ${REPODIR} pull
   ${HG} -R ${REPODIR} update -C default
 }
 
 # Copies new HSTS files in place, and commits them.
deleted file mode 100644
--- a/taskcluster/docker/recipes/buildprops.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "properties": {
-    "buildername": ""
-  },
-  "sourcestamp": {
-    "changes": []
-  },
-  "comments": "TaskCluster Job"
-}
--- 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
@@ -11,17 +11,16 @@ config = {
     #### 32 bit build specific #####
     '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;'
                 '%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',
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
@@ -12,17 +12,16 @@ config = {
     #### 32 bit build specific #####
     '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;'
                 '%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',
     #######################
 }
--- 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
@@ -13,17 +13,16 @@ releng.manifest",
     #### 32 bit build specific #####
     '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;'
                 '%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,
--- 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
@@ -10,17 +10,16 @@ config = {
     'stage_platform': 'win64-add-on-devel',
     #### 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;'
                 '%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',
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
@@ -11,17 +11,16 @@ config = {
     'debug_build': True,
     #### 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;'
                 '%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',
     #######################
 }
--- 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(