Bug 1220684: use namespaced docker-worker caches; r=garndt
This adds a `--level` option to taskcluster-graph, and passes the level supplied from mozilla-taskcluster. It then substitutes that into cache names for just about every cache (tooltool being the exception, as it verifies hashes and is thus immune to poisoning). The scopes for these new cache names are already included in the relevant `moz-tree:level:*` roles. This also strips `-c6` from cache names; I added this when we were transitioning from the Ubuntu-based build images, to ensure I got clean caches. It's no longer necessary.
This commit is contained in:
@@ -260,6 +260,9 @@ class Graph(object):
|
||||
@CommandArgument('--owner',
|
||||
required=True,
|
||||
help='email address of who owns this graph')
|
||||
@CommandArgument('--level',
|
||||
default="1",
|
||||
help='SCM level of this repository')
|
||||
@CommandArgument('--extend-graph',
|
||||
action="store_true", dest="ci", help='Omit create graph arguments')
|
||||
@CommandArgument('--interactive',
|
||||
@@ -346,6 +349,7 @@ class Graph(object):
|
||||
'month': pushdate[4:6],
|
||||
'day': pushdate[6:8],
|
||||
'owner': params['owner'],
|
||||
'level': params['level'],
|
||||
'from_now': json_time_from_now,
|
||||
'now': current_json_time(),
|
||||
'revision_hash': params['revision_hash']
|
||||
@@ -590,6 +594,9 @@ class CIBuild(object):
|
||||
@CommandArgument('--owner',
|
||||
default='foobar@mozilla.com',
|
||||
help='email address of who owns this graph')
|
||||
@CommandArgument('--level',
|
||||
default="1",
|
||||
help='SCM level of this repository')
|
||||
@CommandArgument('build_task',
|
||||
help='path to build task definition')
|
||||
@CommandArgument('--interactive',
|
||||
@@ -628,6 +635,7 @@ class CIBuild(object):
|
||||
build_parameters = dict(gaia_info().items() + {
|
||||
'docker_image': docker_image,
|
||||
'owner': params['owner'],
|
||||
'level': params['level'],
|
||||
'from_now': json_time_from_now,
|
||||
'now': current_json_time(),
|
||||
'base_repository': params['base_repository'] or head_repository,
|
||||
|
||||
Reference in New Issue
Block a user