Bug 1436369 Run blocklist updates on mozilla-beta r=jlorenzo

Summary:
the blocklist and remote-settings changes need to happen on beta,
but not the hsts/hpkp updates, so we have to split out the control of what
runs by project.

Reviewers: jlorenzo

Reviewed By: jlorenzo

Bug #: 1436369

Differential Revision: https://phabricator.services.mozilla.com/D1487

--HG--
extra : rebase_source : 19ccbb67b880ee7bd2dc2a37325dd70de635abad
This commit is contained in:
Simon Fraser 2018-06-01 14:13:44 +01:00
parent 15a948f85a
commit b34aecb22e
3 changed files with 62 additions and 6 deletions

View File

@ -118,3 +118,6 @@ jobs:
mozilla-esr60:
- {weekday: 'Monday', hour: 10, minute: 0}
- {weekday: 'Thursday', hour: 10, minute: 0}
mozilla-beta:
- {weekday: 'Monday', hour: 10, minute: 0}
- {weekday: 'Thursday', hour: 10, minute: 0}

View File

@ -5,9 +5,41 @@
loader: taskgraph.loader.transform:loader
transforms:
- taskgraph.transforms.repo_update:transforms
- taskgraph.transforms.task:transforms
job-defaults:
worker:
env:
DO_HSTS:
by-project:
mozilla-central: "1"
mozilla-esr60: "1"
default: ""
DO_HPKP:
by-project:
mozilla-central: "1"
mozilla-esr60: "1"
default: ""
DO_BLOCKLIST:
by-project:
mozilla-central: "1"
mozilla-esr60: "1"
mozilla-beta: "1"
default: ""
DO_REMOTE_SETTINGS:
by-project:
mozilla-central: "1"
mozilla-esr60: "1"
mozilla-beta: "1"
default: ""
USE_MOZILLA_CENTRAL:
by-project:
mozilla-central: "1"
default: ""
jobs:
hsts-hpkp-blocklist:
name: periodic_file_update
@ -25,12 +57,6 @@ jobs:
docker-image: {in-tree: periodic-updates}
max-run-time: 3600 # Sometimes takes ~40 minutes
env:
DO_HSTS: "1"
DO_HPKP: "1"
DO_BLOCKLIST: "1"
DO_REMOTE_SETTINGS: "1"
USE_MOZILLA_CENTRAL: "1"
BRANCH: mozilla-central
PRODUCT: firefox
REVIEWERS: "mtabara, jlund"
command:

View File

@ -0,0 +1,27 @@
# 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/.
"""
Transform the repo-update task into an actual task description.
"""
from __future__ import absolute_import, print_function, unicode_literals
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.schema import resolve_keyed_by
transforms = TransformSequence()
@transforms.add
def resolve_keys(config, tasks):
for task in tasks:
env = task['worker'].setdefault('env', {})
env['BRANCH'] = config.params['project']
for envvar in env:
resolve_keyed_by(env, envvar, envvar, **config.params)
for envvar in list(env.keys()):
if not env.get(envvar):
del env[envvar]
yield task