First part moving to olympia.test

Makefile-docker

@@ -141,9 +141,9 @@ ui-tests:
 	python manage.py update_permissions_from_mc
 
 	# Create a proper superuser that can be used to access the API
-	python manage.py waffle_switch super-create-accounts on
-	python manage.py waffle_switch activate-autograph-signing on
-	python manage.py createsuperuser --email=uitest@mozilla.com --username=uitest --noinput --add-to-supercreate-group --save-api-credentials=tests/ui/variables.json --hostname=olympia.dev
+	python manage.py waffle_switch super-create-accounts on --create
+	python manage.py waffle_switch activate-autograph-signing on --create
+	python manage.py createsuperuser --email=uitest@mozilla.com --username=uitest --noinput --add-to-supercreate-group --save-api-credentials=tests/ui/variables.json --hostname=olympia.test
 
 	# Generate test add-ons and force a reindex to make sure things are updated
 	python manage.py generate_ui_test_addons

docker-compose.yml

@@ -9,7 +9,7 @@ x-env-mapping: &env
     - MEMCACHE_LOCATION=memcached:11211
     - MYSQL_DATABASE=olympia
     - MYSQL_ROOT_PASSWORD=docker
-    - OLYMPIA_SITE_URL=http://olympia.dev
+    - OLYMPIA_SITE_URL=http://olympia.test
     - PYTHONDONTWRITEBYTECODE=1
     - PYTHONUNBUFFERED=1
     - RECURSION_LIMIT=10000
@@ -25,7 +25,7 @@ services:
     volumes:
       - .:/code
     extra_hosts:
-     - "olympia.dev:127.0.0.1"
+     - "olympia.test:127.0.0.1"
 
   web:
     <<: *worker
@@ -81,4 +81,4 @@ services:
       - "5900"
     shm_size: 2g
     links:
-      - "nginx:olympia.dev"
+      - "nginx:olympia.test"

docs/topics/install/docker.rst

@@ -67,18 +67,18 @@ Accessing the web server
 
 By default our docker-compose config exposes the web-server on port 80 of localhost.
 
-We use ``olympia.dev`` as the default hostname to access your container server (e.g. for
-Firefox Accounts). To be able access the development environment using ``http://olympia.dev``
+We use ``olympia.test`` as the default hostname to access your container server (e.g. for
+Firefox Accounts). To be able access the development environment using ``http://olympia.test``
 you'll need to  edit your ``/etc/hosts`` file on your native operating system.
 For example::
 
-    [ip-address]  olympia.dev
+    [ip-address]  olympia.test
 
 Typically the IP address is localhost (127.0.0.1) but if you're using docker-machine
 see :ref:`accessing-the-web-server-docker-machine` for details of how to get the ip of
 the Docker vm.
 
-By default we configure `OLYMPIA_SITE_URL` to point to `http://olympia.dev`.
+By default we configure `OLYMPIA_SITE_URL` to point to `http://olympia.test`.
 
 If you choose a different hostname you'll need to set that environment variable
 and restart the Docker containers::
@@ -146,7 +146,7 @@ Here's a list of a few of the issues you might face when using Docker.
 Can't access the web server?
 ----------------------------
 
-Check you've created a hosts file entry pointing ``olympia.dev`` to the
+Check you've created a hosts file entry pointing ``olympia.test`` to the
 relevant IP address.
 
 If containers are failing to start use ``docker-compose ps`` to check their
@@ -215,9 +215,9 @@ to the container ``nginx`` from the host ``nginx`` with the following ``nginx``
 
     server {
         listen       80;
-        server_name  olympia.dev;
+        server_name  olympia.test;
         location / {
-            proxy_pass   http://olympia.dev:8880;
+            proxy_pass   http://olympia.test:8880;
         }
     }
 

settings.py

@@ -99,7 +99,7 @@ FXA_CONFIG = {
         'content_host': 'https://stable.dev.lcip.org',
         'oauth_host': 'https://oauth-stable.dev.lcip.org/v1',
         'profile_host': 'https://stable.dev.lcip.org/profile/v1',
-        'redirect_url': 'http://olympia.dev/api/v3/accounts/authenticate/',
+        'redirect_url': 'http://olympia.test/api/v3/accounts/authenticate/',
         'scope': 'profile',
     },
     'internal': {

src/olympia/lib/settings_base.py

@@ -113,7 +113,7 @@ def cors_endpoint_overrides(internal, public):
 
 
 CORS_ENDPOINT_OVERRIDES = cors_endpoint_overrides(
-    public=['localhost:3000', 'olympia.dev'],
+    public=['localhost:3000', 'olympia.test'],
     internal=['localhost:3000'],
 )
 

tests/ui/setup.cfg

@@ -3,4 +3,4 @@ addopts = -r=a -vs --showlocals --tb=short
 sensitive_url = mozilla\.(com|org)
 xfail_strict = true
 DJANGO_SETTINGS_MODULE = settings
-base_url = http://olympia.dev:80
+base_url = http://olympia.test:80