From bb7bcf38e38677fd98a930114856432dacd6d82b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 12 Jun 2019 14:43:14 +0000 Subject: [PATCH] Bug 1557255 - switch from relengapi-proxy to taskcluster-proxy in taskgraph r=rail Bug 1557255 - use taskcluster proxy when running tooltool.py Bug 1557255 - fixing tooltool url Differential Revision: https://phabricator.services.mozilla.com/D34472 --HG-- extra : moz-landing-system : lando --- taskcluster/scripts/misc/tooltool-download.sh | 2 +- taskcluster/taskgraph/actions/create_interactive.py | 2 ++ taskcluster/taskgraph/transforms/job/common.py | 6 +++--- taskcluster/taskgraph/transforms/task.py | 5 ----- testing/mozharness/configs/android/android_common.py | 2 +- testing/mozharness/configs/builds/build_pool_specifics.py | 4 ++-- testing/mozharness/configs/openh264/macosx64.py | 4 ++-- testing/mozharness/configs/repackage/linux32_signed.py | 2 +- testing/mozharness/configs/repackage/linux64_signed.py | 2 +- testing/mozharness/configs/repackage/osx_partner.py | 2 +- testing/mozharness/configs/repackage/osx_signed.py | 2 +- .../mozharness/configs/single_locale/tc_android-api-16.py | 2 +- testing/mozharness/configs/single_locale/tc_macosx64.py | 2 +- .../configs/web_platform_tests/prod_config_android.py | 2 +- 14 files changed, 18 insertions(+), 21 deletions(-) diff --git a/taskcluster/scripts/misc/tooltool-download.sh b/taskcluster/scripts/misc/tooltool-download.sh index 8674f7d605ad..9d974eea73e4 100644 --- a/taskcluster/scripts/misc/tooltool-download.sh +++ b/taskcluster/scripts/misc/tooltool-download.sh @@ -20,7 +20,7 @@ fi if [ -n "$RELENGAPI_PORT" ]; then # When the worker has the relengapi proxy setup, use it. - TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --tooltool-url=http://relengapi/tooltool/" + TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --tooltool-url=http://taskcluster/tooltool.mozilla-releng.net/" fi if [ -n "$UPLOAD_DIR" ]; then diff --git a/taskcluster/taskgraph/actions/create_interactive.py b/taskcluster/taskgraph/actions/create_interactive.py index 02267bedabc4..3d50d4951715 100644 --- a/taskcluster/taskgraph/actions/create_interactive.py +++ b/taskcluster/taskgraph/actions/create_interactive.py @@ -54,8 +54,10 @@ SCOPE_WHITELIST = [ re.compile(r'^secrets:get:project/taskcluster/gecko/(hgfingerprint|hgmointernal)$'), # public downloads are OK re.compile(r'^docker-worker:relengapi-proxy:tooltool.download.public$'), + re.compile(r'^project:releng:services/tooltool/api/download/public$'), # internal downloads are OK re.compile(r'^docker-worker:relengapi-proxy:tooltool.download.internal$'), + re.compile(r'^project:releng:services/tooltool/api/download/internal$'), # level-appropriate secrets are generally necessary to run a task; these # also are "not that secret" - most of them are built into the resulting # binary and could be extracted by someone with `strings`. diff --git a/taskcluster/taskgraph/transforms/job/common.py b/taskcluster/taskgraph/transforms/job/common.py index 5506ad85194a..f42410e59ddf 100644 --- a/taskcluster/taskgraph/transforms/job/common.py +++ b/taskcluster/taskgraph/transforms/job/common.py @@ -230,12 +230,12 @@ def docker_worker_add_tooltool(config, job, taskdesc, internal=False): 'TOOLTOOL_CACHE': '{workdir}/tooltool-cache'.format(**job['run']), }) - taskdesc['worker']['relengapi-proxy'] = True + taskdesc['worker']['taskcluster-proxy'] = True taskdesc['scopes'].extend([ - 'docker-worker:relengapi-proxy:tooltool.download.public', + 'project:releng:services/tooltool/api/download/public', ]) if internal: taskdesc['scopes'].extend([ - 'docker-worker:relengapi-proxy:tooltool.download.internal', + 'project:releng:services/tooltool/api/download/internal', ]) diff --git a/taskcluster/taskgraph/transforms/task.py b/taskcluster/taskgraph/transforms/task.py index 9e9b1d788d57..f158b1f972cd 100644 --- a/taskcluster/taskgraph/transforms/task.py +++ b/taskcluster/taskgraph/transforms/task.py @@ -394,7 +394,6 @@ def verify_index(config, index): ), # worker features that should be enabled - Required('relengapi-proxy'): bool, Required('chain-of-trust'): bool, Required('taskcluster-proxy'): bool, Required('allow-ptrace'): bool, @@ -504,9 +503,6 @@ def build_docker_worker_payload(config, task, task_def): features = {} - if worker.get('relengapi-proxy'): - features['relengAPIProxy'] = True - if worker.get('taskcluster-proxy'): features['taskclusterProxy'] = True @@ -1330,7 +1326,6 @@ def set_defaults(config, tasks): worker = task['worker'] if worker['implementation'] in ('docker-worker',): - worker.setdefault('relengapi-proxy', False) worker.setdefault('chain-of-trust', False) worker.setdefault('taskcluster-proxy', False) worker.setdefault('allow-ptrace', False) diff --git a/testing/mozharness/configs/android/android_common.py b/testing/mozharness/configs/android/android_common.py index 55902b8a868f..797bd7d2ac1b 100644 --- a/testing/mozharness/configs/android/android_common.py +++ b/testing/mozharness/configs/android/android_common.py @@ -43,7 +43,7 @@ config = { 'run-tests', ], "tooltool_cache": os.environ.get("TOOLTOOL_CACHE"), - "tooltool_servers": ['http://relengapi/tooltool/'], + "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/builds/build_pool_specifics.py b/testing/mozharness/configs/builds/build_pool_specifics.py index 698815e1eca3..b405076986f0 100644 --- a/testing/mozharness/configs/builds/build_pool_specifics.py +++ b/testing/mozharness/configs/builds/build_pool_specifics.py @@ -4,8 +4,8 @@ config = { "taskcluster": { # use the relengapi proxy to talk to tooltool - "tooltool_servers": ['http://relengapi/tooltool/'], - "tooltool_url": 'http://relengapi/tooltool/', + "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 c8a3fdab9cca..98784922eb85 100644 --- a/testing/mozharness/configs/openh264/macosx64.py +++ b/testing/mozharness/configs/openh264/macosx64.py @@ -30,6 +30,6 @@ config = { '-fuse-ld=%(abs_work_dir)s/src/cctools/bin/x86_64-darwin11-ld'), 'PATH': '%(abs_work_dir)s/src/clang/bin/:%(PATH)s', }, - "tooltool_servers": ['http://relengapi/tooltool/'], - "tooltool_url": 'http://relengapi/tooltool/', + "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 36c270940d50..834241f706d3 100644 --- a/testing/mozharness/configs/repackage/linux32_signed.py +++ b/testing/mozharness/configs/repackage/linux32_signed.py @@ -6,7 +6,7 @@ config = { "locale": os.environ.get("LOCALE"), # ToolTool - "tooltool_url": 'http://relengapi/tooltool/', + "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 a7ec08ede520..ac0774142c70 100644 --- a/testing/mozharness/configs/repackage/linux64_signed.py +++ b/testing/mozharness/configs/repackage/linux64_signed.py @@ -6,7 +6,7 @@ config = { "locale": os.environ.get("LOCALE"), # ToolTool - "tooltool_url": 'http://relengapi/tooltool/', + "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 2c64d83a08c8..d6fdd2a26822 100644 --- a/testing/mozharness/configs/repackage/osx_partner.py +++ b/testing/mozharness/configs/repackage/osx_partner.py @@ -6,6 +6,6 @@ config = { "repack_id": os.environ.get("REPACK_ID"), # ToolTool - "tooltool_url": 'http://relengapi/tooltool/', + "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 9d8da4e077a3..695305ffece0 100644 --- a/testing/mozharness/configs/repackage/osx_signed.py +++ b/testing/mozharness/configs/repackage/osx_signed.py @@ -6,6 +6,6 @@ config = { "locale": os.environ.get("LOCALE"), # ToolTool - "tooltool_url": 'http://relengapi/tooltool/', + "tooltool_url": 'http://taskcluster/tooltool.mozilla-releng.net/', 'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'), } 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 ffdfe3a38a48..236c6d39cbe5 100644 --- a/testing/mozharness/configs/single_locale/tc_android-api-16.py +++ b/testing/mozharness/configs/single_locale/tc_android-api-16.py @@ -15,7 +15,7 @@ config = { "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest", "output_dir": "%(abs_work_dir)s/src", }, - "tooltool_servers": ['http://relengapi/tooltool/'], + "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 3bd98f6be6a2..d9c3316c3434 100644 --- a/testing/mozharness/configs/single_locale/tc_macosx64.py +++ b/testing/mozharness/configs/single_locale/tc_macosx64.py @@ -13,7 +13,7 @@ config = { 'UPLOAD_PATH': '/builds/worker/artifacts/', }, - "tooltool_url": 'http://relengapi/tooltool/', + "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 36827b99e361..ae1ed94b636b 100644 --- a/testing/mozharness/configs/web_platform_tests/prod_config_android.py +++ b/testing/mozharness/configs/web_platform_tests/prod_config_android.py @@ -25,5 +25,5 @@ config = { "minidump_stackwalk_path": "linux64-minidump_stackwalk", "per_test_category": "web-platform", "tooltool_cache": os.environ.get("TOOLTOOL_CACHE"), - "tooltool_servers": ['http://relengapi/tooltool/'], + "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'], }