зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Rok Garbas
Родитель
bb718d74fc
Коммит
bb7bcf38e3
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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`.
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
])
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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/',
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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/',
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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/'],
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче