Skip to content

Commit

Permalink
Migrate to Circle CI (#16189)
Browse files Browse the repository at this point in the history
  • Loading branch information
willdurand committed Dec 18, 2020
1 parent 93c55ff commit 2a3ce33
Show file tree
Hide file tree
Showing 11 changed files with 467 additions and 135 deletions.
467 changes: 455 additions & 12 deletions .circleci/config.yml

Large diffs are not rendered by default.

109 changes: 0 additions & 109 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
:target: https://github.com/mozilla/addons-server/blob/master/.github/CODE_OF_CONDUCT.md
:alt: Code of conduct

.. image:: https://travis-ci.org/mozilla/addons-server.svg?branch=master
:target: https://travis-ci.org/mozilla/addons-server
.. image:: https://circleci.com/gh/mozilla/addons-server.svg?style=svg
:target: https://circleci.com/gh/mozilla/addons-server


Addons-Server
Expand Down
4 changes: 2 additions & 2 deletions contribute.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"repository": {
"url": "https://github.com/mozilla/addons-server",
"license": "BSD 3-Clause",
"tests": "https://travis-ci.org/mozilla/addons-server"
"tests": "https://app.circleci.com/pipelines/github/mozilla/addons-server"
},
"participate": {
"home": "https://wiki.mozilla.org/Add-ons/Contribute/AMO/Code",
"docs": "http://addons-server.readthedocs.io/",
"matrix": "https://chat.mozilla.org/#/room/#amo:mozilla.org",
"matrix": "https://chat.mozilla.org/#/room/#amo:mozilla.org"
},
"bugs": {
"list": "https://github.com/mozilla/addons-server/issues",
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ services:

autograph:
image: mozilla/autograph:3.3.2
command: /go/bin/autograph -c /code/scripts/autograph_travis_test_config.yaml
command: /go/bin/autograph -c /code/scripts/autograph_localdev_config.yaml
volumes:
- .:/code

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Note: Most of the configuration here got copied from
# Note (1): Most of the configuration here got copied from
# https://github.com/mozilla-services/autograph/blob/master/autograph.yaml
#
# Note (2): the content of the file is also embedded in `.circleci/config.yml`.
# Any change here should likely be duplicated.

server:
# This port should be perfectly free, the upstream default of 8000
Expand Down
5 changes: 0 additions & 5 deletions src/olympia/amo/search.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import os

from django.conf import settings as dj_settings

from django_statsd.clients import statsd
Expand All @@ -26,9 +24,6 @@ def get_es(hosts=None, timeout=None, **settings):
else getattr(dj_settings, 'ES_TIMEOUT', DEFAULT_TIMEOUT)
)

if os.environ.get('RUNNING_IN_CI'):
settings['http_auth'] = ('elastic', 'changeme')

return Elasticsearch(hosts, timeout=timeout, **settings)


Expand Down
2 changes: 1 addition & 1 deletion src/olympia/lib/settings_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def path(*folders):


def get_db_config(environ_var, atomic_requests=True):
values = env.db(var=environ_var, default='mysql://root:@localhost/olympia')
values = env.db(var=environ_var, default='mysql://root:@127.0.0.1/olympia')

values.update(
{
Expand Down
2 changes: 1 addition & 1 deletion src/olympia/reviewers/tests/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ def test_basic(self):
assert readme_data['status'] == 'D'
assert readme_data['depth'] == 0
assert readme_data['filename'] == 'README.md'
# Not testing mimetype as text/markdown is missing in travis mimetypes
# Not testing mimetype as text/markdown is missing in CI mimetypes
# database. But it doesn't matter much here since we're primarily
# after the git status.
assert readme_data['mime_category'] is None
Expand Down
2 changes: 1 addition & 1 deletion src/olympia/versions/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def test_write_svg_to_png(filename):
out = os.path.join(out_dir, 'a', 'b.png')
write_svg_to_png(svg, out)
assert storage.exists(out)
# compare the image content. rms should be 0 but travis renders it
# compare the image content. rms should be 0 but CI renders it
# different... 3 is the magic difference.
svg_png_img = Image.open(svg_png)
svg_out_img = Image.open(out)
Expand Down

0 comments on commit 2a3ce33

Please sign in to comment.