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

Bug 1284475 - migrate ToolTool blueprint to new codebase of relengapi r=KWierso

Browse Source 
UPGRADE_NSS_RELEASE a=kaie
MozReview-Commit-ID: 7CB1VYb8OJP

--HG--
extra : rebase_source : 04751620add813cd1780898d109d9f7fa89d7b2d
This commit is contained in:
Rok Garbas 2017-08-08 10:55:52 +02:00
parent 216e775829
commit f3a3affcf2
19 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/devtools/automation/winbuildenv.sh
View File

@ -30,7 +30,7 @@ fi
if ! which mozmake 2>/dev/null; then
export PATH="$PATH:$SOURCE/.."
if ! which mozmake 2>/dev/null; then
TT_SERVER=${TT_SERVER:-https://api.pub.build.mozilla.org/tooltool/}
TT_SERVER=${TT_SERVER:-https://tooltool.mozilla-releng.net/}
( cd $SOURCE/..; $SOURCE/mach artifact toolchain -v --tooltool-manifest $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest --tooltool-url $TT_SERVER --retry 4${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
fi
fi

2
python/mozboot/bin/bootstrap-msys2.vbs
View File

@ -53,7 +53,7 @@ End If
On Error Resume Next
' Download and move MSYS2 into the right place
Download "https://api.pub.build.mozilla.org/tooltool/sha512/f93a685c8a10abbd349cbef5306441ba235c4cbfba1cc000299e11b58f258e9953cbe23463515407925eeca94c3f5d8e5f637c95be387e620845efa43cdcb0c0", "msys2.zip"
Download "https://tooltool.mozilla-releng.net/sha512/f93a685c8a10abbd349cbef5306441ba235c4cbfba1cc000299e11b58f258e9953cbe23463515407925eeca94c3f5d8e5f637c95be387e620845efa43cdcb0c0", "msys2.zip"
Set FilesInZip = appShell.NameSpace(fso.GetAbsolutePathName("msys2.zip")).Items()
appShell.NameSpace(msysPath).CopyHere(FilesInZip)
' MSYS2 archive doesn't have tmp directory...

4
python/mozbuild/mozbuild/action/tooltool.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2.7
# tooltool is a lookaside cache implemented in Python
# Copyright (C) 2011 John H. Ford <john@johnford.info>
@ -999,7 +999,7 @@ def main(argv, _skip_logging=False):
# default the options list if not provided
if not options_obj.base_url:
options_obj.base_url = ['https://api.pub.build.mozilla.org/tooltool/']
options_obj.base_url = ['https://tooltool.mozilla-releng.net/']
# ensure all URLs have a trailing slash
def add_slash(url):

2
python/mozbuild/mozbuild/mach_commands.py
View File

@ -1802,7 +1802,7 @@ class PackageFrontend(MachCommandBase):
cache_dir = os.path.join(self._mach_context.state_dir, 'toolchains')
tooltool_url = (tooltool_url or
'https://api.pub.build.mozilla.org/tooltool').rstrip('/')
'https://tooltool.mozilla-releng.net').rstrip('/')
cache = ArtifactCache(cache_dir=cache_dir, log=self.log,
skip_cache=skip_cache)

2
security/nss/automation/taskcluster/windows/setup.sh
View File

@ -23,4 +23,4 @@ hg_clone() {
}
hg_clone https://hg.mozilla.org/build/tools tools default
tools/scripts/tooltool/tooltool_wrapper.sh $(dirname $0)/releng.manifest https://api.pub.build.mozilla.org/tooltool/ non-existant-file.sh /c/mozilla-build/python/python.exe /c/builds/tooltool.py --authentication-file /c/builds/relengapi.tok -c /c/builds/tooltool_cache
tools/scripts/tooltool/tooltool_wrapper.sh $(dirname $0)/releng.manifest https://tooltool.mozilla-releng.net/ non-existant-file.sh /c/mozilla-build/python/python.exe /c/builds/tooltool.py --authentication-file /c/builds/relengapi.tok -c /c/builds/tooltool_cache

2
taskcluster/docker/centos6-build/system-setup.sh
View File

@ -284,7 +284,7 @@ curl https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py
tooltool_fetch() {
cat >manifest.tt
python $BUILD/tooltool.py fetch
python2.7 $BUILD/tooltool.py fetch
rm manifest.tt
}

2
taskcluster/docker/recipes/common.sh
View File

@ -5,6 +5,6 @@
tooltool_fetch() {
cat >manifest.tt
python /setup/tooltool.py fetch
python2.7 /setup/tooltool.py fetch
rm manifest.tt
}

2
taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh
View File

@ -126,7 +126,7 @@ dpkg-reconfigure locales
tooltool_fetch() {
cat >manifest.tt
python /setup/tooltool.py fetch
python2.7 /setup/tooltool.py fetch
rm manifest.tt
}

2
taskcluster/scripts/builder/build-haz-linux.sh
View File

@ -53,7 +53,7 @@ export MOZ_OBJDIR="$WORKSPACE/obj-analyzed"
mkdir -p "$MOZ_OBJDIR"
if [ -n "$DO_TOOLTOOL" ]; then
( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v --tooltool-url https://api.pub.build.mozilla.org/tooltool/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} )
( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} )
fi
export NO_MERCURIAL_SETUP_CHECK=1

2
taskcluster/scripts/builder/sm-tooltool-config.sh
View File

@ -2,7 +2,7 @@
set -xe
: ${TOOLTOOL_SERVER:=https://api.pub.build.mozilla.org/tooltool/}
: ${TOOLTOOL_SERVER:=https://tooltool.mozilla-releng.net/}
: ${SPIDERMONKEY_VARIANT:=plain}
: ${UPLOAD_DIR:=$HOME/artifacts/}
: ${WORK:=$HOME/workspace}

2
testing/mozharness/configs/developer_config.py
View File

@ -46,5 +46,5 @@ config = {
"gittool.py": 'http://hg.mozilla.org/build/puppet/raw-file/faaf5abd792e/modules/packages/files/gittool.py',
# Android related
"host_utils_url": "https://api.pub.build.mozilla.org/tooltool/sha512/372c89f9dccaf5ee3b9d35fd1cfeb089e1e5db3ff1c04e35aa3adc8800bc61a2ae10e321f37ae7bab20b56e60941f91bb003bcb22035902a73d70872e7bd3282",
"host_utils_url": "https://tooltool.mozilla-releng.net/sha512/372c89f9dccaf5ee3b9d35fd1cfeb089e1e5db3ff1c04e35aa3adc8800bc61a2ae10e321f37ae7bab20b56e60941f91bb003bcb22035902a73d70872e7bd3282",
}

2
testing/mozharness/configs/single_locale/win32.py
View File

@ -29,7 +29,7 @@ config = {
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',

2
testing/mozharness/configs/single_locale/win32_devedition.py
View File

@ -29,7 +29,7 @@ config = {
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',

2
testing/mozharness/configs/single_locale/win64.py
View File

@ -29,7 +29,7 @@ config = {
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',

2
testing/mozharness/configs/single_locale/win64_devedition.py
View File

@ -29,7 +29,7 @@ config = {
"vcs_share_base": "c:/builds/hg-shared",
# tooltool
'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',

2
testing/mozharness/mozharness/mozilla/testing/codecoverage.py
View File

@ -81,7 +81,7 @@ class CodeCoverageMixin(object):
'config/tooltool-manifests/linux64/ccov.manifest')
tooltool_path = self._fetch_tooltool_py()
cmd = [tooltool_path, '--url', 'https://api.pub.build.mozilla.org/tooltool/', 'fetch', \
cmd = [tooltool_path, '--url', 'https://tooltool.mozilla-releng.net/', 'fetch', \
'-m', manifest, '-o', '-c', '/home/worker/tooltool-cache']
self.run_command(cmd, cwd=self.grcov_dir)
self.run_command(['tar', '-jxvf', os.path.join(self.grcov_dir, 'grcov-linux-standalone-x86_64.tar.bz2'), \

2
testing/mozharness/mozharness/mozilla/tooltool.py
View File

@ -15,7 +15,7 @@ TOOLTOOL_PY_URL = \
"https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py"
TOOLTOOL_SERVERS = [
'https://api.pub.build.mozilla.org/tooltool/',
'https://tooltool.mozilla-releng.net/',
]

2
testing/mozharness/scripts/fx_desktop_build.py
View File

@ -66,7 +66,7 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object):
# jobs have a minimal `hg pull`.
"clone_upstream_url": "https://hg.mozilla.org/mozilla-unified",
"repo_base": "https://hg.mozilla.org",
'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
'tooltool_url': 'https://tooltool.mozilla-releng.net/',
"graph_selector": "/server/collect.cgi",
# only used for make uploadsymbols
'old_packages': [

2
tools/mach_commands.py
View File

@ -228,7 +228,7 @@ class FormatProvider(MachCommandBase):
target = os.path.join(self._mach_context.state_dir, os.path.basename(root))
if not os.path.exists(target):
tooltool_url = "https://api.pub.build.mozilla.org/tooltool/sha512/"
tooltool_url = "https://tooltool.mozilla-releng.net/sha512/"
if self.prompt and raw_input("Download clang-format executables from {0} (yN)? ".format(tooltool_url)).lower() != 'y': # noqa: E501,F821
print("Download aborted.")
return None