Backed out changeset 69049d8a2c4b (bug 1594530) on tomprince's request. CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Sun, 10 Nov 2019 05:33:35 +0200
changeset 501418 ad5f78a825b08c829f4853c2f7b4d9afb3f0881b
parent 501417 32ee3bf157f4e0fa2fdce214b54c257c5c4a8dab
child 501419 72c52c0101cfd102b207224646c3007d6872e65c
push id36791
push usercsabou@mozilla.com
push dateSun, 10 Nov 2019 09:53:30 +0000
treeherdermozilla-central@72c52c0101cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1594530
milestone72.0a1
backs out69049d8a2c4b9ee877d2153ce6f01fd0549f90c3
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
Backed out changeset 69049d8a2c4b (bug 1594530) on tomprince's request. CLOSED TREE
taskcluster/scripts/misc/tooltool-download.sh
testing/mozharness/configs/android/android_common.py
testing/mozharness/configs/android/wrench.py
testing/mozharness/configs/builds/build_pool_specifics.py
testing/mozharness/configs/openh264/macosx64.py
testing/mozharness/configs/repackage/linux32_signed.py
testing/mozharness/configs/repackage/linux64_signed.py
testing/mozharness/configs/repackage/osx_partner.py
testing/mozharness/configs/repackage/osx_signed.py
testing/mozharness/configs/repackage/win64_partner.py
testing/mozharness/configs/single_locale/tc_android-api-16.py
testing/mozharness/configs/single_locale/tc_macosx64.py
testing/mozharness/configs/web_platform_tests/prod_config_android.py
--- a/taskcluster/scripts/misc/tooltool-download.sh
+++ b/taskcluster/scripts/misc/tooltool-download.sh
@@ -14,23 +14,18 @@ esac
 TOOLTOOL_DL_FLAGS=
 
 if [ -e "$TOOLTOOL_AUTH_FILE" ]; then
     # When the worker has the relengapi token pass it down
     TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --authentication-file=$TOOLTOOL_AUTH_FILE"
 fi
 
 if [ -n "$TASKCLUSTER_PROXY_URL" ]; then
-    TOOLTOOL_HOST="tooltool.mozilla-releng.net"
-    LEGACY_TC_ROOT_URL="https://taskcluster.net"
-    if [ ${TASKCLUSTER_ROOT_URL:-${LEGACY_TC_ROOT_URL}} != ${LEGACY_TC_ROOT_URL} ]; then
-        TOOLTOOL_HOST="tooltool.staging.mozilla-releng.net"
-    fi
     # When the worker has the relengapi proxy setup, use it.
-    TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --tooltool-url=${TASKCLUSTER_PROXY_URL}/${TOOLTOOL_HOST}/"
+    TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --tooltool-url=${TASKCLUSTER_PROXY_URL}/tooltool.mozilla-releng.net/"
 fi
 
 if [ -n "$UPLOAD_DIR" ]; then
     TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --artifact-manifest $UPLOAD_DIR/toolchains.json"
 fi
 
 : TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/builds/worker/tooltool-cache}
 export TOOLTOOL_CACHE
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -1,20 +1,15 @@
 # Shared/common mozharness configuration for Android unit tests.
 #
 # This configuration should be combined with platform-specific mozharness
 # configuration such as androidx86_7_0.py, android_hw, or similar.
 
 import os
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 
 def WebglSuite(name):
     return {
         "run_filename": "runtestsremote.py",
         "testsdir": "mochitest",
         "options": [
             "--app=%(app)s",
             "--remote-webserver=%(remote_webserver)s",
@@ -43,17 +38,17 @@ config = {
         'start-emulator',
         'download-and-extract',
         'create-virtualenv',
         'verify-device',
         'install',
         'run-tests',
     ],
     "tooltool_cache": os.environ.get("TOOLTOOL_CACHE"),
-    "tooltool_servers": [tooltool_url],
+    "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'],
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
     "avds_dir": "/builds/worker/workspace/build/.android",
     # "log_format": "%(levelname)8s - %(message)s",
     "log_tbpl_level": "info",
     "log_raw_level": "info",
     "minidump_stackwalk_path": "linux64-minidump_stackwalk",
     # To take device screenshots at timed intervals (each time in seconds, relative
     # to the start of the run-tests step) specify screenshot_times. For example, to
--- a/testing/mozharness/configs/android/wrench.py
+++ b/testing/mozharness/configs/android/wrench.py
@@ -1,22 +1,16 @@
 # mozharness configuration for Android x86 7.0 unit tests
 #
 # This configuration should be combined with suite definitions and other
 # mozharness configuration from android_common.py, or similar.
-import os
-
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
 
 config = {
     "tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86_7_0/releng.manifest",
-    "tooltool_servers": [tooltool_url],
+    "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'],
     "emulator_manifest": """
         [
         {
             "algorithm": "sha512",
             "visibility": "internal",
             "filename": "android-sdk_r29.2.1.0-linux-x86emu.tar.gz",
             "unpack": true,
             "digest": "4014389d2e0c6889edf89a714e4defbd42c2bced79eee1cce726a9b2c921c6d857723f918a9f1b7dca35b9f8d6cbfdf6b47d2934d800bdd396bf5c17ada3b827",
--- a/testing/mozharness/configs/builds/build_pool_specifics.py
+++ b/testing/mozharness/configs/builds/build_pool_specifics.py
@@ -1,19 +1,13 @@
 # this is a dict of pool specific keys/values. As this fills up and more
 # fx build factories are ported, we might deal with this differently
-import os
-
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
 
 config = {
     "taskcluster": {
         # use the relengapi proxy to talk to tooltool
-        "tooltool_servers": [tooltool_url],
-        "tooltool_url": tooltool_url,
+        "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'],
+        "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/',
         'upload_env': {
             'UPLOAD_PATH': '/builds/worker/artifacts',
         },
     },
 }
--- a/testing/mozharness/configs/openh264/macosx64.py
+++ b/testing/mozharness/configs/openh264/macosx64.py
@@ -2,21 +2,16 @@ import os
 
 import mozharness
 
 external_tools_path = os.path.join(
     os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),
     'external_tools',
 )
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     'tooltool_manifest_file': "osx.manifest",
     'tooltool_cache': "/builds/tooltool_cache",
     'exes': {
         'gittool.py': [os.path.join(external_tools_path, 'gittool.py')],
         'python2.7': "python2.7",
     },
     'dump_syms_binary': 'dump_syms',
@@ -32,11 +27,11 @@ config = {
         'LDFLAGS': ('-target x86_64-apple-darwin '
                     '-B {MOZ_FETCHES_DIR}/cctools/bin '
                     '-isysroot %(abs_work_dir)s/src/MacOSX10.11.sdk '
                     '-mmacosx-version-min=10.11'
                      .format(MOZ_FETCHES_DIR=os.environ['MOZ_FETCHES_DIR'])),
         'PATH': ('{MOZ_FETCHES_DIR}/clang/bin/:%(PATH)s'
                  .format(MOZ_FETCHES_DIR=os.environ['MOZ_FETCHES_DIR'])),
     },
-    "tooltool_servers": [tooltool_url],
-    "tooltool_url": tooltool_url,
+    "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'],
+    "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/',
 }
--- a/testing/mozharness/configs/repackage/linux32_signed.py
+++ b/testing/mozharness/configs/repackage/linux32_signed.py
@@ -1,18 +1,13 @@
 import os
 
 platform = "linux32"
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "locale": os.environ.get("LOCALE"),
 
     # ToolTool
-    "tooltool_url": tooltool_url,
+    "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }
--- a/testing/mozharness/configs/repackage/linux64_signed.py
+++ b/testing/mozharness/configs/repackage/linux64_signed.py
@@ -1,18 +1,13 @@
 import os
 
 platform = "linux64"
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "locale": os.environ.get("LOCALE"),
 
     # ToolTool
-    "tooltool_url": tooltool_url,
+    "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }
--- a/testing/mozharness/configs/repackage/osx_partner.py
+++ b/testing/mozharness/configs/repackage/osx_partner.py
@@ -1,16 +1,11 @@
 import os
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "src_mozconfig": "browser/config/mozconfigs/macosx64/repack",
 
     "repack_id": os.environ.get("REPACK_ID"),
 
     # ToolTool
-    "tooltool_url": tooltool_url,
+    "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 }
--- a/testing/mozharness/configs/repackage/osx_signed.py
+++ b/testing/mozharness/configs/repackage/osx_signed.py
@@ -1,16 +1,11 @@
 import os
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "src_mozconfig": "browser/config/mozconfigs/macosx64/repack",
 
     "locale": os.environ.get("LOCALE"),
 
     # ToolTool
-    "tooltool_url": tooltool_url,
+    "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 }
--- a/testing/mozharness/configs/repackage/win64_partner.py
+++ b/testing/mozharness/configs/repackage/win64_partner.py
@@ -1,19 +1,14 @@
 import os
 
 platform = "win64"
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "repack_id": os.environ.get("REPACK_ID"),
 
-    'tooltool_url': tooltool_url,
+    'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'run_configure': False,
 
     'env': {
         'PATH': "%(abs_input_dir)s/upx/bin:%(PATH)s",
     }
 }
--- a/testing/mozharness/configs/single_locale/tc_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/tc_android-api-16.py
@@ -1,15 +1,8 @@
-import os
-
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "l10n_dir": "l10n-central",
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
 
     "objdir": "obj-firefox",
     "repack_env": {
         "MOZ_OBJDIR": "obj-firefox",
@@ -17,17 +10,17 @@ config = {
 
     'vcs_share_base': "/builds/hg-shared",
 
     "mozconfig": "src/mobile/android/config/mozconfigs/android-api-16/l10n-nightly",
     "tooltool_config": {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
         "output_dir": "%(abs_work_dir)s/src",
     },
-    "tooltool_servers": [tooltool_url],
+    "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'],
 
     "upload_env": {
         'UPLOAD_PATH': '/builds/worker/artifacts/',
     },
     'secret_files': [
         {'filename': '/builds/gls-gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gls-gapi.data',
          'min_scm_level': 1},
--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -1,25 +1,20 @@
 import os
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "bootstrap_env": {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "obj-firefox",
         "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
         "DIST": "%(abs_objdir)s",
         "L10NBASEDIR": "../../l10n",
         'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
     },
     "upload_env": {
         'UPLOAD_PATH': '/builds/worker/artifacts/',
     },
 
-    "tooltool_url": tooltool_url,
+    "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/',
 
     "vcs_share_base": "/builds/hg-shared",
 }
 
--- a/testing/mozharness/configs/web_platform_tests/prod_config_android.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_android.py
@@ -1,20 +1,15 @@
 # ***** BEGIN LICENSE BLOCK *****
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 # ***** END LICENSE BLOCK *****
 import os
 
-tooltool_url = 'http://taskcluster/tooltool.mozilla-releng.net/'
-if os.environ.get('TASKCLUSTER_ROOT_URL', 'https://taskcluster.net') != 'https://taskcluster.net':
-    # Pre-point tooltool at staging cluster so we can run in parallel with legacy cluster
-    tooltool_url = 'http://taskcluster/tooltool.staging.mozilla-releng.net/'
-
 config = {
     "options": [
         "--prefs-root=%(test_path)s/prefs",
         "--processes=1",
         "--config=%(test_path)s/wptrunner.ini",
         "--ca-cert-path=%(test_path)s/tests/tools/certs/cacert.pem",
         "--host-key-path=%(test_path)s/tests/tools/certs/web-platform.test.key",
         "--host-cert-path=%(test_path)s/tests/tools/certs/web-platform.test.pem",
@@ -25,10 +20,10 @@ config = {
     "binary_path": "/tmp",
     "geckodriver": "%(abs_test_bin_dir)s/geckodriver",
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
     "log_tbpl_level": "info",
     "log_raw_level": "info",
     "minidump_stackwalk_path": "linux64-minidump_stackwalk",
     "per_test_category": "web-platform",
     "tooltool_cache": os.environ.get("TOOLTOOL_CACHE"),
-    "tooltool_servers": [tooltool_url],
+    "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'],
 }