Commit 81e60d87 authored by marc duez's avatar marc duez
Browse files

gitlab.ci.yml : remove edit already included in docker-compose-dev.yml

parent 900b693b
Pipeline #258070 failed with stages
in 3 minutes and 19 seconds
......@@ -42,17 +42,12 @@ stages:
stage: test_cypress_server
before_script:
# Server
- docker build --build-arg git_branch=$CI_COMMIT_REF_NAME --build-arg build_env=TEST -t "vidjil/server:test" docker/vidjil-server
- docker build --build-arg git_branch=$CI_COMMIT_REF_NAME --build-arg build_env=TEST -t "vidjil/client:test" docker/vidjil-client
- sed -i '/\:\/etc\/nginx\/ssl/d' ./docker/docker-compose.yml
- sed -i '/\/var\/lib\/mysql/d' ./docker/docker-compose.yml
- sed -i 's/\/opt\/vidjil\/databases/databases/' ./docker/docker-compose.yml
- echo -e "volumes:\n databases:" >> ./docker/docker-compose.yml
- sed -i 's/\:latest/\:test/g' ./docker/docker-compose.yml
- docker pull vidjil/client:latest
- docker pull vidjil/server:latest
- cd docker/vidjil-server/conf/ && mv defs.py defs_https.py && mv defs_http.py defs.py && cd ../../..
- make germline && cp browser/js/germline.js docker/vidjil-client/conf
- mkdir -p docker/postfix/ssl
- cd docker && docker-compose up -d && cd ..
- cd docker && docker-compose up -d -f docker-compose-dev.yml && cd ..
- sed -i "s/^python\ \.\.\/\.\.\/\.\./docker\ exec\ docker_uwsgi_1\ python\ \/usr\/share\/vidjil\/server\/web2py/" server/web2py/applications/vidjil/tests/init_tests.sh
- docker exec docker_uwsgi_1 sed -i "s/^\(FILE_SOURCE .*\)/FILE_SOURCE = '\/usr\/share\/vidjil\/demo'/" /usr/share/vidjil/server/web2py/applications/vidjil/modules/defs.py
- docker exec docker_nginx_1 make -C /usr/share/vidjil browser
......@@ -65,17 +60,6 @@ stages:
HOST: review
## cypress client
client_firefox_legacy:
extends:
- .test_cypress_base
variables:
BROWSER: browsers/firefox_legacy/firefox
client_firefox_latest:
extends:
- .test_cypress_base
variables:
BROWSER: browsers/firefox_latest/firefox
client_chrome_latest:
extends:
......@@ -83,27 +67,8 @@ client_chrome_latest:
variables:
BROWSER: browsers/chrome_latest/chrome
client_chrome_legacy:
extends:
- .test_cypress_base
variables:
BROWSER: browsers/chrome_legacy/chrome
## Cypress with server
server_firefox_legacy:
extends:
- .test_cypress_base
- .test_cypress_server
variables:
BROWSER: browsers/firefox_legacy/firefox
server_firefox_latest:
extends:
- .test_cypress_base
- .test_cypress_server
variables:
BROWSER: browsers/firefox_latest/firefox
server_chrome_latest:
extends:
......@@ -112,9 +77,4 @@ server_chrome_latest:
variables:
BROWSER: browsers/chrome_latest/chrome
server_chrome_legacy:
extends:
- .test_cypress_base
- .test_cypress_server
variables:
BROWSER: browsers/chrome_legacy/chrome
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment