Skip to content

Commit

Permalink
Bug 1153186 - s/TBPL_BUGS_TRANSFER_ENABLED/MIRROR_CLASSIFICATIONS/
Browse files Browse the repository at this point in the history
  • Loading branch information
Ed Morley committed Apr 13, 2015
1 parent 87f6605 commit bddfcfe
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion tests/conftest.py
Expand Up @@ -52,7 +52,8 @@ def pytest_sessionstart(session):
settings.CELERY_ALWAYS_EAGER = True
settings.CELERY_EAGER_PROPAGATES_EXCEPTIONS = True

settings.TBPL_BUGS_TRANSFER_ENABLED = False
# Don't attempt to submit bug associations to Bugzilla & Elasticsearch.
settings.MIRROR_CLASSIFICATIONS = False

# Reconfigure pulse to operate on default vhost of rabbitmq
settings.PULSE_URI = settings.BROKER_URL
Expand Down
2 changes: 1 addition & 1 deletion treeherder/model/derived/jobs.py
Expand Up @@ -663,7 +663,7 @@ def insert_bug_job_map(self, job_id, bug_id, assignment_type, submit_timestamp,
except IntegrityError as e:
raise JobDataIntegrityError(e)

if settings.TBPL_BUGS_TRANSFER_ENABLED:
if settings.MIRROR_CLASSIFICATIONS:
job = self.get_job(job_id)[0]
if job["state"] == "completed":
# importing here to avoid an import loop
Expand Down
2 changes: 1 addition & 1 deletion treeherder/settings/base.py
Expand Up @@ -329,7 +329,7 @@
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')

# Set this to True to submit bug associations to Bugzilla & Elasticsearch.
TBPL_BUGS_TRANSFER_ENABLED = True
MIRROR_CLASSIFICATIONS = True
ES_HOST = "http://elasticsearch-zlb.webapp.scl3.mozilla.com:9200"

# TBPLBOT is the Bugzilla account used to make the bug comments on
Expand Down
4 changes: 2 additions & 2 deletions treeherder/settings/local.sample.py
Expand Up @@ -31,8 +31,8 @@

SITE_URL = "http://local.treeherder.mozilla.org"

# Set this to True to submit bug associations to Bugzilla & OrangeFactor.
TBPL_BUGS_TRANSFER_ENABLED = False
# Set this to True to submit bug associations to Bugzilla & Elasticsearch.
MIRROR_CLASSIFICATIONS = False

# TBPLBOT is the Bugzilla account used to make the bug comments on
# intermittent failure bugs when failures are classified.
Expand Down

0 comments on commit bddfcfe

Please sign in to comment.