From 6b4475cbdcfd4f86759c4553e5818a1f2f616a8e Mon Sep 17 00:00:00 2001 From: Dorel Luca Date: Wed, 6 Nov 2019 23:20:13 +0200 Subject: [PATCH] Backed out 2 changesets (bug 1594530) for Toolchain failure. a=backout Backed out changeset c1e66d6fc61e (bug 1594530) Backed out changeset 9c751b07dda1 (bug 1594530) --- taskcluster/scripts/misc/tooltool-download.sh | 7 +------ testing/mozharness/configs/android/android_common.py | 7 +------ testing/mozharness/configs/android/wrench.py | 8 +------- .../mozharness/configs/builds/build_pool_specifics.py | 10 ++-------- testing/mozharness/configs/openh264/macosx64.py | 9 ++------- testing/mozharness/configs/repackage/linux32_signed.py | 7 +------ testing/mozharness/configs/repackage/linux64_signed.py | 7 +------ testing/mozharness/configs/repackage/osx_partner.py | 7 +------ testing/mozharness/configs/repackage/osx_signed.py | 7 +------ testing/mozharness/configs/repackage/win64_partner.py | 7 +------ .../configs/single_locale/tc_android-api-16.py | 9 +-------- .../mozharness/configs/single_locale/tc_macosx64.py | 7 +------ .../configs/web_platform_tests/prod_config_android.py | 7 +------ 13 files changed, 15 insertions(+), 84 deletions(-) diff --git a/taskcluster/scripts/misc/tooltool-download.sh b/taskcluster/scripts/misc/tooltool-download.sh index b05152d1ec51..853d34c19be5 100644 --- a/taskcluster/scripts/misc/tooltool-download.sh +++ b/taskcluster/scripts/misc/tooltool-download.sh @@ -19,13 +19,8 @@ if [ -e "$TOOLTOOL_AUTH_FILE" ]; then 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_URL}/" + TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --tooltool-url=${TASKCLUSTER_PROXY_URL}/tooltool.mozilla-releng.net/" fi if [ -n "$UPLOAD_DIR" ]; then diff --git a/testing/mozharness/configs/android/android_common.py b/testing/mozharness/configs/android/android_common.py index f236a7d7e121..3a645256fb1a 100644 --- a/testing/mozharness/configs/android/android_common.py +++ b/testing/mozharness/configs/android/android_common.py @@ -5,11 +5,6 @@ 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 { @@ -48,7 +43,7 @@ config = { '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", diff --git a/testing/mozharness/configs/android/wrench.py b/testing/mozharness/configs/android/wrench.py index 6a7f3c855a1d..05aae3721026 100644 --- a/testing/mozharness/configs/android/wrench.py +++ b/testing/mozharness/configs/android/wrench.py @@ -2,16 +2,10 @@ # # 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": """ [ { diff --git a/testing/mozharness/configs/builds/build_pool_specifics.py b/testing/mozharness/configs/builds/build_pool_specifics.py index 808a88aa479f..b405076986f0 100644 --- a/testing/mozharness/configs/builds/build_pool_specifics.py +++ b/testing/mozharness/configs/builds/build_pool_specifics.py @@ -1,17 +1,11 @@ # 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', }, diff --git a/testing/mozharness/configs/openh264/macosx64.py b/testing/mozharness/configs/openh264/macosx64.py index 1acd91425982..ce36eab5036e 100644 --- a/testing/mozharness/configs/openh264/macosx64.py +++ b/testing/mozharness/configs/openh264/macosx64.py @@ -7,11 +7,6 @@ external_tools_path = os.path.join( '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", @@ -37,6 +32,6 @@ config = { '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/', } diff --git a/testing/mozharness/configs/repackage/linux32_signed.py b/testing/mozharness/configs/repackage/linux32_signed.py index d02c41053925..834241f706d3 100644 --- a/testing/mozharness/configs/repackage/linux32_signed.py +++ b/testing/mozharness/configs/repackage/linux32_signed.py @@ -2,16 +2,11 @@ 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, diff --git a/testing/mozharness/configs/repackage/linux64_signed.py b/testing/mozharness/configs/repackage/linux64_signed.py index df5b33a016e5..ac0774142c70 100644 --- a/testing/mozharness/configs/repackage/linux64_signed.py +++ b/testing/mozharness/configs/repackage/linux64_signed.py @@ -2,16 +2,11 @@ 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, diff --git a/testing/mozharness/configs/repackage/osx_partner.py b/testing/mozharness/configs/repackage/osx_partner.py index 64f2e4a00f1b..d6fdd2a26822 100644 --- 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'), } diff --git a/testing/mozharness/configs/repackage/osx_signed.py b/testing/mozharness/configs/repackage/osx_signed.py index c9614a70d993..695305ffece0 100644 --- 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'), } diff --git a/testing/mozharness/configs/repackage/win64_partner.py b/testing/mozharness/configs/repackage/win64_partner.py index a37e89783708..54ec61f3a629 100644 --- a/testing/mozharness/configs/repackage/win64_partner.py +++ b/testing/mozharness/configs/repackage/win64_partner.py @@ -2,15 +2,10 @@ 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': { diff --git a/testing/mozharness/configs/single_locale/tc_android-api-16.py b/testing/mozharness/configs/single_locale/tc_android-api-16.py index e9821be1f724..388fbc7a58c1 100644 --- a/testing/mozharness/configs/single_locale/tc_android-api-16.py +++ b/testing/mozharness/configs/single_locale/tc_android-api-16.py @@ -1,10 +1,3 @@ -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", @@ -22,7 +15,7 @@ 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/', diff --git a/testing/mozharness/configs/single_locale/tc_macosx64.py b/testing/mozharness/configs/single_locale/tc_macosx64.py index 1bfbf517f135..d9c3316c3434 100644 --- a/testing/mozharness/configs/single_locale/tc_macosx64.py +++ b/testing/mozharness/configs/single_locale/tc_macosx64.py @@ -1,10 +1,5 @@ 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", @@ -18,7 +13,7 @@ config = { 'UPLOAD_PATH': '/builds/worker/artifacts/', }, - "tooltool_url": tooltool_url, + "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/', "vcs_share_base": "/builds/hg-shared", } diff --git a/testing/mozharness/configs/web_platform_tests/prod_config_android.py b/testing/mozharness/configs/web_platform_tests/prod_config_android.py index 5ff7aff1df8d..4a2946c7f526 100644 --- a/testing/mozharness/configs/web_platform_tests/prod_config_android.py +++ b/testing/mozharness/configs/web_platform_tests/prod_config_android.py @@ -5,11 +5,6 @@ # ***** 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", @@ -30,5 +25,5 @@ config = { "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/'], }