Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed order to do not twitter/facebook tests at same time.

Browse source
This commit is contained in:
Martin Edenhofer 2016-01-14 00:41:24 +01:00
parent 922c9cd928
commit 9e95305ace
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
.gitlab-ci.yml
View file

@ -293,40 +293,6 @@ job_integration_browser_ff_3:
- rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
- script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
job_integration_twitter_chrome:
stage: browser
tags:
- browser-chrome
- twitter
script:
- export BROWSER_PORT=4041
- export WS_PORT=4042
- export BROWSER_URL=http://$IP:$BROWSER_PORT
- RAILS_ENV=test rake db:create
- cp contrib/auto_wizard_test.json auto_wizard.json
- script/bootstrap.sh
- rake assets:precompile
- script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
- ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
- script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
job_integration_facebook_chrome:
stage: browser
tags:
- browser-chrome
- facebook
script:
- export BROWSER_PORT=4051
- export WS_PORT=4052
- export BROWSER_URL=http://$IP:$BROWSER_PORT
- RAILS_ENV=test rake db:create
- cp contrib/auto_wizard_test.json auto_wizard.json
- script/bootstrap.sh
- rake assets:precompile
- script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
- ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
- script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
job_integration_autowizard_chrome: job_integration_autowizard_chrome:
stage: browser stage: browser
tags: tags:
@ -402,3 +368,37 @@ job_integration_browser_chrome_3:
- script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
- rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
- script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
job_integration_twitter_chrome:
stage: browser
tags:
- browser-chrome
- twitter
script:
- export BROWSER_PORT=4041
- export WS_PORT=4042
- export BROWSER_URL=http://$IP:$BROWSER_PORT
- RAILS_ENV=test rake db:create
- cp contrib/auto_wizard_test.json auto_wizard.json
- script/bootstrap.sh
- rake assets:precompile
- script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
- ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
- script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
job_integration_facebook_chrome:
stage: browser
tags:
- browser-chrome
- facebook
script:
- export BROWSER_PORT=4051
- export WS_PORT=4052
- export BROWSER_URL=http://$IP:$BROWSER_PORT
- RAILS_ENV=test rake db:create
- cp contrib/auto_wizard_test.json auto_wizard.json
- script/bootstrap.sh
- rake assets:precompile
- script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT
- ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
- script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT