From 9e95305ace10d2ee1daea191406ac7de61c187f7 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 14 Jan 2016 00:41:24 +0100 Subject: [PATCH] Changed order to do not twitter/facebook tests at same time. --- .gitlab-ci.yml | 68 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1a5dd595..56eb42c05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -293,40 +293,6 @@ job_integration_browser_ff_3: - 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 -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: stage: browser tags: @@ -402,3 +368,37 @@ job_integration_browser_chrome_3: - 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 - 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