Commit b9782f20 authored by Mathieu Giraud's avatar Mathieu Giraud

Merge branch 'feature-sc/separate-build-for-each-browser' into 'dev'

gitlab-ci : separate build for each browser

See merge request !542
parents 1010d8e3 b0d778e8
Pipeline #105070 passed with stages
in 6 minutes and 52 seconds
......@@ -233,6 +233,13 @@ test_browser_unit:
- /^hotfix-.*c.*\/.*$/
- prod-client
- schedules
tags:
- web
.browser-functional-chrome:
extends: .browser-functional
variables:
WATIR_CHROME: "1"
.browser-functional-external:
stage: test_functional_external
......@@ -250,38 +257,50 @@ test_browser_unit:
- /^hotfix-.*c.*\/.*$/
- prod-client
- schedules
tags:
- web
test_browser-functional:
.browser-functional-external-chrome:
extends: .browser-functional-external
variables:
WATIR_CHROME: "1"
ff32-browser-functional:
extends: .browser-functional
variables:
BROWSERS: "--browsers-from-file"
tags:
- web
FIREFOX_VERSION: 32
test_legacy-browser-functional:
ff45-browser-functional:
extends: .browser-functional
variables:
WATIR_CHROME: "1"
IGNORE_FUNCTIONAL_CBP: "1"
FIREFOX_VERSION: 45
chrome-browser-functional:
extends: .browser-functional-chrome
old-chrome-browser-functional:
extends: .browser-functional-chrome
tags:
- legacy
test_browser-functional-external:
ff32-browser-functional-external:
extends: .browser-functional-external
variables:
BROWSERS: "--browsers-from-file"
tags:
- web
FIREFOX_VERSION: 32
test_legacy-browser-functional-external:
ff45-browser-functional-external:
extends: .browser-functional-external
variables:
WATIR_CHROME: "1"
IGNORE_FUNCTIONAL_CBP: "1"
FIREFOX_VERSION: 45
chrome-browser-functional-external:
extends: .browser-functional-external-chrome
old-chrome-browser-functional-external-chrome:
extends: .browser-functional-external-chrome
tags:
- legacy
code_quality:
stage: test_quality
script: make -C browser quality
......@@ -319,7 +338,7 @@ test_server_unit:
tags:
- web
test_server_functional:
.test_server_functional:
stage: test_functional
script:
- docker build --no-cache --build-arg git_branch=$CI_COMMIT_REF_NAME --build-arg build_env=TEST -t "vidjil/server:test" docker/vidjil-server
......@@ -334,7 +353,7 @@ test_server_functional:
- docker exec docker_nginx_1 make -C /usr/share/vidjil browser
- source /etc/profile.d/rvm.sh
- rvm use 2.6.1
- HEADLESS=1 make functional_server BROWSERS="--browsers-from-file" || (cd docker && docker-compose stop; docker stop $(docker ps -aq); docker rm $(docker ps -aq); docker rmi "vidjil/server:test" "vidjil/client:test"; false)
- HEADLESS=1 make functional_server || (cd docker && docker-compose stop; docker stop $(docker ps -aq); docker rm $(docker ps -aq); docker rmi "vidjil/server:test" "vidjil/client:test"; false)
- cd docker && docker-compose stop
- docker stop $(docker ps -aq)
- docker rm $(docker ps -aq)
......@@ -349,6 +368,17 @@ test_server_functional:
- x86_64
- docker
ff32-server-functional:
extends: .test_server_functional
variables:
FIREFOX_VERSION: 32
ff45-server-functional:
extends: .test_server_functional
variables:
FIREFOX_VERSION: 45
# Benchmark
......
# sh launch_functional_tests functional/test_*rb
if [ -z "$FUNCTIONAL_CLIENT_BROWSER_PATH" -o ! -z "$IGNORE_FUNCTIONAL_CBP" ]; then
FUNCTIONAL_CLIENT_BROWSER_PATH="."
fi
if [ "$1" = "--browsers-from-file" ]
then
shift
if [ ! -f ./tested-browsers ]; then
exit 1
fi
BROWSER_LIST=`sed "s#^#$FUNCTIONAL_CLIENT_BROWSER_DIR#" ./tested-browsers`
if [ ! -z "$FIREFOX_PATH" -a ! -z "$FIREFOX_VERSION" ]; then
BROWSER_LIST="$(printf $FIREFOX_PATH $FIREFOX_VERSION)"
else
BROWSER_LIST=$FUNCTIONAL_CLIENT_BROWSER_PATH
BROWSER_LIST=.
fi
FUNCTIONAL_TESTS=$*
......
firefox/v32/firefox
firefox/v45/firefox
chrome/default/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