From f3a3affcf2986ae6e332d88c5ced67d11ac16e19 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 8 Aug 2017 10:55:52 +0200 Subject: [PATCH] Bug 1284475 - migrate ToolTool blueprint to new codebase of relengapi r=KWierso UPGRADE_NSS_RELEASE a=kaie MozReview-Commit-ID: 7CB1VYb8OJP --HG-- extra : rebase_source : 04751620add813cd1780898d109d9f7fa89d7b2d --- js/src/devtools/automation/winbuildenv.sh | 2 +- python/mozboot/bin/bootstrap-msys2.vbs | 2 +- python/mozbuild/mozbuild/action/tooltool.py | 4 ++-- python/mozbuild/mozbuild/mach_commands.py | 2 +- security/nss/automation/taskcluster/windows/setup.sh | 2 +- taskcluster/docker/centos6-build/system-setup.sh | 2 +- taskcluster/docker/recipes/common.sh | 2 +- taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh | 2 +- taskcluster/scripts/builder/build-haz-linux.sh | 2 +- taskcluster/scripts/builder/sm-tooltool-config.sh | 2 +- testing/mozharness/configs/developer_config.py | 2 +- testing/mozharness/configs/single_locale/win32.py | 2 +- testing/mozharness/configs/single_locale/win32_devedition.py | 2 +- testing/mozharness/configs/single_locale/win64.py | 2 +- testing/mozharness/configs/single_locale/win64_devedition.py | 2 +- testing/mozharness/mozharness/mozilla/testing/codecoverage.py | 2 +- testing/mozharness/mozharness/mozilla/tooltool.py | 2 +- testing/mozharness/scripts/fx_desktop_build.py | 2 +- tools/mach_commands.py | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/js/src/devtools/automation/winbuildenv.sh b/js/src/devtools/automation/winbuildenv.sh index 7647eb06d428..3e652548d47b 100644 --- a/js/src/devtools/automation/winbuildenv.sh +++ b/js/src/devtools/automation/winbuildenv.sh @@ -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 diff --git a/python/mozboot/bin/bootstrap-msys2.vbs b/python/mozboot/bin/bootstrap-msys2.vbs index 304d4f9df80d..9d1d5ee871aa 100644 --- a/python/mozboot/bin/bootstrap-msys2.vbs +++ b/python/mozboot/bin/bootstrap-msys2.vbs @@ -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... diff --git a/python/mozbuild/mozbuild/action/tooltool.py b/python/mozbuild/mozbuild/action/tooltool.py index a57477d3ec3a..458b1bc1f948 100755 --- a/python/mozbuild/mozbuild/action/tooltool.py +++ b/python/mozbuild/mozbuild/action/tooltool.py @@ -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 @@ -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): diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index fb83b917900b..5a0960c1680d 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -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) diff --git a/security/nss/automation/taskcluster/windows/setup.sh b/security/nss/automation/taskcluster/windows/setup.sh index 7def50db4f51..23e99c602634 100644 --- a/security/nss/automation/taskcluster/windows/setup.sh +++ b/security/nss/automation/taskcluster/windows/setup.sh @@ -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 diff --git a/taskcluster/docker/centos6-build/system-setup.sh b/taskcluster/docker/centos6-build/system-setup.sh index d0f8467498d6..f5e81624280a 100644 --- a/taskcluster/docker/centos6-build/system-setup.sh +++ b/taskcluster/docker/centos6-build/system-setup.sh @@ -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 } diff --git a/taskcluster/docker/recipes/common.sh b/taskcluster/docker/recipes/common.sh index ca3fc6996976..dbf0503887e3 100644 --- a/taskcluster/docker/recipes/common.sh +++ b/taskcluster/docker/recipes/common.sh @@ -5,6 +5,6 @@ tooltool_fetch() { cat >manifest.tt - python /setup/tooltool.py fetch + python2.7 /setup/tooltool.py fetch rm manifest.tt } diff --git a/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh b/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh index 9ac892ebae35..a8bb56000f79 100644 --- a/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh +++ b/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh @@ -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 } diff --git a/taskcluster/scripts/builder/build-haz-linux.sh b/taskcluster/scripts/builder/build-haz-linux.sh index 67dfcc812fa1..f8116bf6c8d8 100755 --- a/taskcluster/scripts/builder/build-haz-linux.sh +++ b/taskcluster/scripts/builder/build-haz-linux.sh @@ -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 diff --git a/taskcluster/scripts/builder/sm-tooltool-config.sh b/taskcluster/scripts/builder/sm-tooltool-config.sh index 596c5390b922..a85d3bab1e3a 100755 --- a/taskcluster/scripts/builder/sm-tooltool-config.sh +++ b/taskcluster/scripts/builder/sm-tooltool-config.sh @@ -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} diff --git a/testing/mozharness/configs/developer_config.py b/testing/mozharness/configs/developer_config.py index d15884368a67..e30ff7719600 100644 --- a/testing/mozharness/configs/developer_config.py +++ b/testing/mozharness/configs/developer_config.py @@ -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", } diff --git a/testing/mozharness/configs/single_locale/win32.py b/testing/mozharness/configs/single_locale/win32.py index d7d7a9c8c381..ac35eddb5dab 100644 --- a/testing/mozharness/configs/single_locale/win32.py +++ b/testing/mozharness/configs/single_locale/win32.py @@ -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', diff --git a/testing/mozharness/configs/single_locale/win32_devedition.py b/testing/mozharness/configs/single_locale/win32_devedition.py index 345059877c55..c999cc533bda 100644 --- a/testing/mozharness/configs/single_locale/win32_devedition.py +++ b/testing/mozharness/configs/single_locale/win32_devedition.py @@ -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', diff --git a/testing/mozharness/configs/single_locale/win64.py b/testing/mozharness/configs/single_locale/win64.py index 510054665c79..c20d0fba1847 100644 --- a/testing/mozharness/configs/single_locale/win64.py +++ b/testing/mozharness/configs/single_locale/win64.py @@ -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', diff --git a/testing/mozharness/configs/single_locale/win64_devedition.py b/testing/mozharness/configs/single_locale/win64_devedition.py index 056aaf8ee4e0..b69554288a3b 100644 --- a/testing/mozharness/configs/single_locale/win64_devedition.py +++ b/testing/mozharness/configs/single_locale/win64_devedition.py @@ -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', diff --git a/testing/mozharness/mozharness/mozilla/testing/codecoverage.py b/testing/mozharness/mozharness/mozilla/testing/codecoverage.py index 0169bed98631..94e691d69c9b 100644 --- a/testing/mozharness/mozharness/mozilla/testing/codecoverage.py +++ b/testing/mozharness/mozharness/mozilla/testing/codecoverage.py @@ -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'), \ diff --git a/testing/mozharness/mozharness/mozilla/tooltool.py b/testing/mozharness/mozharness/mozilla/tooltool.py index fac59629d065..25cadcbdf30b 100644 --- a/testing/mozharness/mozharness/mozilla/tooltool.py +++ b/testing/mozharness/mozharness/mozilla/tooltool.py @@ -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/', ] diff --git a/testing/mozharness/scripts/fx_desktop_build.py b/testing/mozharness/scripts/fx_desktop_build.py index 373537fd630b..2d13f1917099 100755 --- a/testing/mozharness/scripts/fx_desktop_build.py +++ b/testing/mozharness/scripts/fx_desktop_build.py @@ -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': [ diff --git a/tools/mach_commands.py b/tools/mach_commands.py index 9ff251c2a019..c5588cd620fa 100644 --- a/tools/mach_commands.py +++ b/tools/mach_commands.py @@ -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