Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1237182: Get rid of buildprops.json r=tomprince,sfraser

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D1443

--HG--
extra : rebase_source : 1683b76377e27fdaa5292e1781573ddc4e61afa8
This commit is contained in:
Chris AtLee 2018-05-25 17:35:43 -04:00
parent 92b876c415
commit 8e5587759f
14 changed files with 3 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/mozconfig.cache
View File

@ -7,12 +7,6 @@
# 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

3
python/mozbuild/mozbuild/artifacts.py
View File

@ -668,8 +668,7 @@ class TaskCache(CacheManager):
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:

6
taskcluster/docker/android-build/Dockerfile
View File

@ -48,12 +48,6 @@ COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
# %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

6
taskcluster/docker/debian7-build/Dockerfile
View File

@ -67,9 +67,3 @@ COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
# 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/

8
taskcluster/docker/desktop1604-test/buildprops.json
View File

@ -1,8 +0,0 @@
{
"properties": {
"buildername": ""
},
"sourcestamp": {
"changes": []
}
}

6
taskcluster/docker/mingw32-build/Dockerfile
View File

@ -46,9 +46,3 @@ RUN apt-get update && \
# 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/

14
taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
View File

@ -39,7 +39,6 @@ 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)"
@ -351,20 +350,11 @@ function clone_build_tools {
${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

9
taskcluster/docker/recipes/buildprops.json
View File

@ -1,9 +0,0 @@
{
"properties": {
"buildername": ""
},
"sourcestamp": {
"changes": []
},
"comments": "TaskCluster Job"
}

1
testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
View File

@ -16,7 +16,6 @@ config = {
'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',

1
testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
View File

@ -17,7 +17,6 @@ config = {
'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',

1
testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
View File

@ -18,7 +18,6 @@ releng.manifest",
'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',

1
testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
View File

@ -15,7 +15,6 @@ config = {
'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',

1
testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
View File

@ -16,7 +16,6 @@ config = {
'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',

1
testing/mozharness/external_tools/gittool.py
View File

@ -42,7 +42,6 @@ if __name__ == '__main__':
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,