Bug 1446479 - Windows tasks shouldn't try to use the relengapi-proxy. r=tomprince
authorJustin Wood <Callek@gmail.com>
Fri, 16 Mar 2018 16:32:43 -0400
changeset 408580 30458407e1e4b9914a9dbddcade2da9a18f9bbd2
parent 408579 7c25484d9888d1be690ce53bd4a5ecd1c3af724b
child 408581 00ca51f4fafc584260b05fbe7577ba675d73f6b5
push id100982
push userCallek@gmail.com
push dateFri, 16 Mar 2018 20:46:52 +0000
treeherdermozilla-inbound@30458407e1e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1446479
milestone61.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 1446479 - Windows tasks shouldn't try to use the relengapi-proxy. r=tomprince So, it seems we've (since I landed windows l10n in taskcluster) been using http://relengapi/tooltool/ as the tooltool url, this has only been working because if we have the relevent file in local cache we don't query against tooltool. With TC's windows spinup process it fetches a set of tooltool files to cache locally, and this has been saving us, meaning we're very lucky. However maple (beta-based) and central have just diverged in manifests, because central now uses a newer VS version than what we have on maple. This patch will fix that to use the new tooltool location that we currently use for Windows builds, and aligns the repackage jobs to use the newer url too.
testing/mozharness/configs/repackage/win32_signed.py
testing/mozharness/configs/repackage/win64_signed.py
testing/mozharness/configs/single_locale/tc_win32.py
testing/mozharness/configs/single_locale/tc_win64.py
--- a/testing/mozharness/configs/repackage/win32_signed.py
+++ b/testing/mozharness/configs/repackage/win32_signed.py
@@ -38,13 +38,13 @@ config = {
     "locale": os.environ.get("LOCALE"),
 
     "download_config": download_config,
 
     "repackage_config": repackage_config,
 
     # ToolTool
     "tooltool_manifest_src": 'browser\\config\\tooltool-manifests\\{}\\releng.manifest'.format(platform),
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
+    'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }
--- a/testing/mozharness/configs/repackage/win64_signed.py
+++ b/testing/mozharness/configs/repackage/win64_signed.py
@@ -30,13 +30,13 @@ config = {
     "locale": os.environ.get("LOCALE"),
 
     "download_config": download_config,
 
     "repackage_config": repackage_config,
 
     # ToolTool
     "tooltool_manifest_src": 'browser\\config\\tooltool-manifests\\{}\\releng.manifest'.format(platform),
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
+    'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }
--- a/testing/mozharness/configs/single_locale/tc_win32.py
+++ b/testing/mozharness/configs/single_locale/tc_win32.py
@@ -21,11 +21,11 @@ config = {
         'EN_US_PACKAGE_NAME': 'target.zip',
         'EN_US_PKG_INST_BASENAME': 'target.installer',
     },
     "upload_env": {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
 
-    "tooltool_url": 'http://relengapi/tooltool/',
+    "tooltool_url": 'https://tooltool.mozilla-releng.net/',
     'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/releng.manifest",
 }
--- a/testing/mozharness/configs/single_locale/tc_win64.py
+++ b/testing/mozharness/configs/single_locale/tc_win64.py
@@ -21,12 +21,12 @@ config = {
         'EN_US_PACKAGE_NAME': 'target.zip',
         'EN_US_PKG_INST_BASENAME': 'target.installer',
     },
     "upload_env": {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
     },
 
-    "tooltool_url": 'http://relengapi/tooltool/',
+    "tooltool_url": 'https://tooltool.mozilla-releng.net/',
     'tooltool_manifest_src': "browser/config/tooltool-manifests/win64/releng.manifest",
 }