From d45f634e052d6a6392a7cdfd4c302661d6e6dadc Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 18 Jan 2016 03:18:33 +0100 Subject: [PATCH] Reorganised. --- .gitlab-ci.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9935ddd19..f3f18b3f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -293,20 +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_autowizard_chrome: - stage: browser - tags: - - browser-chrome - script: - - export BROWSER_URL=http://$IP:$BROWSER_PORT - - RAILS_ENV=test rake db:create - - cp contrib/auto_wizard_example.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/auto_wizard_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_browser_chrome_1: stage: browser tags: @@ -403,3 +389,18 @@ job_integration_otrs_chrome: - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT - ruby -I test/ test/integration/otrs_import_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: + - browser-chrome + script: + - export BROWSER_URL=http://$IP:$BROWSER_PORT + - RAILS_ENV=test rake db:create + - cp contrib/auto_wizard_example.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/auto_wizard_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 +