* For Heroku Review Apps define tasks defaulting to the Firefox CI Taskcluster instance

The Pulse sources are configured differently on Heroku Review Apps because `PULSE_PUSH_SOURCES` and `PULSE_TASK_SOURCES` are defined as arrays rather than a string.

This is because `app.json` is a Json file and we cannot specify an array by mixing single & double
quotes.

* Bump the Redis and JawsDB add-ons to handle load
* Remove ingesting android-components as it causes noise
* Default LOGGING_LEVEL to INFO as we can handle the extra logging
This commit is contained in:
Armen Zambrano 2020-01-14 09:06:22 -05:00 коммит произвёл GitHub
Родитель f29e0c0ad7
Коммит b4463cc9c1
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 8 добавлений и 7 удалений

Просмотреть файл

@ -2,10 +2,10 @@
"addons": [ "addons": [
"scheduler", "scheduler",
"cloudamqp:tiger", "cloudamqp:tiger",
"heroku-redis", "heroku-redis:premium-0",
"papertrail:choklad", "papertrail:choklad",
{ {
"plan": "jawsdb:leopard", "plan": "jawsdb:blacktip",
"options": { "options": {
"version": "5.7" "version": "5.7"
} }
@ -32,6 +32,7 @@
"HEROKU_APP_NAME": { "HEROKU_APP_NAME": {
"required": true "required": true
}, },
"LOGGING_LEVEL": "INFO",
"PULSE_URL": "amqp://treeherder-shared-pulse-user:mozilla123@pulse.mozilla.org:5671/?ssl=true", "PULSE_URL": "amqp://treeherder-shared-pulse-user:mozilla123@pulse.mozilla.org:5671/?ssl=true",
"PULSE_RESULSETS_QUEUE_NAME": { "PULSE_RESULSETS_QUEUE_NAME": {
"generator": "secret" "generator": "secret"
@ -40,7 +41,7 @@
"generator": "secret" "generator": "secret"
}, },
"PROJECTS_TO_INGEST": { "PROJECTS_TO_INGEST": {
"value": "autoland,android-components" "value": "autoland"
}, },
"TREEHERDER_DJANGO_SECRET_KEY": { "TREEHERDER_DJANGO_SECRET_KEY": {
"generator": "secret" "generator": "secret"

Просмотреть файл

@ -23,7 +23,7 @@ class Command(BaseCommand):
# [{pulse_url: .., hgmo: true, root_url: ..}, ..] # [{pulse_url: .., hgmo: true, root_url: ..}, ..]
push_sources = env.json( push_sources = env.json(
"PULSE_PUSH_SOURCES", "PULSE_PUSH_SOURCES",
default=[{"root_url": "https://taskcluster.net", "github": True, "hgmo": True, "pulse_url": env("PULSE_URL")}]) default=[{"root_url": "https://firefox-ci-tc.services.mozilla.com", "github": True, "hgmo": True, "pulse_url": env("PULSE_URL")}])
consumers = prepare_consumers( consumers = prepare_consumers(
PushConsumer, PushConsumer,

Просмотреть файл

@ -22,7 +22,7 @@ class Command(BaseCommand):
# root_url: ..}, ..] # root_url: ..}, ..]
task_sources = env.json( task_sources = env.json(
"PULSE_TASK_SOURCES", "PULSE_TASK_SOURCES",
default=[{"root_url": "https://taskcluster.net", "pulse_url": env("PULSE_URL")}]) default=[{"root_url": "https://firefox-ci-tc.services.mozilla.com", "pulse_url": env("PULSE_URL")}])
consumers = prepare_consumers( consumers = prepare_consumers(
TaskConsumer, TaskConsumer,

Просмотреть файл

@ -15,7 +15,7 @@ from treeherder.workers.task import retryable_task
@retryable_task(name='store-pulse-tasks', max_retries=10) @retryable_task(name='store-pulse-tasks', max_retries=10)
def store_pulse_tasks(pulse_job, exchange, routing_key, root_url='https://taskcluster.net'): def store_pulse_tasks(pulse_job, exchange, routing_key, root_url='https://firefox-ci-tc.services.mozilla.com'):
""" """
Fetches tasks from Taskcluster Fetches tasks from Taskcluster
""" """
@ -34,7 +34,7 @@ def store_pulse_tasks(pulse_job, exchange, routing_key, root_url='https://taskcl
@retryable_task(name='store-pulse-pushes', max_retries=10) @retryable_task(name='store-pulse-pushes', max_retries=10)
def store_pulse_pushes(body, exchange, routing_key, root_url='https://taskcluster.net'): def store_pulse_pushes(body, exchange, routing_key, root_url='https://firefox-ci-tc.services.mozilla.com'):
""" """
Fetches the pushes pending from pulse exchanges and loads them. Fetches the pushes pending from pulse exchanges and loads them.
""" """