* Move CI envvar definition to selenium override config.

This should fix autoreload.

* Actually use  to be more explicit

* Disable integration tests

* Try out different approach

* Add docs, move back the variable definition to docker-compose.yml

* Update comment
This commit is contained in:
Christopher Grebs 2019-09-12 14:05:33 +02:00 коммит произвёл GitHub
Родитель 3a15aafb70
Коммит dcc103af6e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 21 добавлений и 5 удалений

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

@ -36,7 +36,7 @@ jobs:
- build_and_push_container_image:
image_tag: latest
dockerfile: "Dockerfile.deploy"
build-tag:
machine: true
working_directory: ~/addons-server
@ -45,7 +45,7 @@ jobs:
- build_and_push_container_image:
image_tag: "${CIRCLE_TAG}"
dockerfile: "Dockerfile.deploy"
integration_test:
working_directory: ~/addons-server
machine:

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

@ -18,7 +18,7 @@ x-env-mapping: &env
- TERM=xterm-256color
- UITEST_FXA_EMAIL
- UITEST_FXA_PASSWORD=uitester
- CI=${CI}
- CIRCLECI=${CIRCLECI}
services:
worker: &worker

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

@ -18,11 +18,27 @@ enable-threads = true
# Run watchmedo (via watchdog) to implement unrestricted
# autoreload capability.
fs-reload = %(base)/docker/artifacts/
# CI is only being set on circleci. See addons-server issue #12064
if-not-env = CI
# `CIRCLECI` is empty by default and only set to `true` by CircleCI.
# See addons-server issue #12064
# First copy the environment value
if-env = CIRCLECI
running-circleci = %(_)
endif =
# But default to it being set to `none`
>>>>>>> 4ce35f9854728006edb90b41c45093664a7964dc
if-not-env = CIRCLECI
running-circleci = none
endif =
# If the value is actually set to `true` (which it is in CircleCI)
# then don't run the autoreload
if-not-opt = running-circleci=true
safe-pidfile = %(base)/docker/artifacts/addons-server-uwsgi-master.pid
attach-daemon = setsid watchmedo shell-command --patterns="*.py" --recursive --command='/usr/bin/touch %(safe-pidfile)' %(base)
endif =
max-requests = 5000
# Load apps in workers and not only in master