From 6685b585d3a7670ab9deb3fdad95a40fcdd5a30a Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 21 May 2016 11:13:58 +0200 Subject: [PATCH] Split core browser tests into 4 slices. --- .gitlab-ci.yml | 40 +++++++++++++++++ script/build/test_slice_tests.sh | 76 ++++++++++++++++++++++++++++---- 2 files changed, 108 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d17a4a6f2..60400b6fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -544,6 +544,26 @@ test:browser:core:chrome_3_mysql: - 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 +test:browser:core:chrome_4_mysql: + stage: browser + dependencies: + - browser:build + tags: + - browser-chrome + - mysql + script: + - export BROWSER_URL=http://$IP:$BROWSER_PORT + - unset MAILBOX_AUTO1 + - unset MAILBOX_AUTO2 + - unset MAILBOX_MANUAL1 + - unset MAILBOX_MANUAL2 + - script/build/test_slice_tests.sh 4 + - RAILS_ENV=test rake db:create + - script/bootstrap.sh + - 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 + test:browser:core:chrome_1_postgresql: stage: browser dependencies: @@ -604,6 +624,26 @@ test:browser:core:chrome_3_postgresql: - 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 +test:browser:core:chrome_4_postgresql: + stage: browser + dependencies: + - browser:build + tags: + - browser-chrome + - postgresql + script: + - export BROWSER_URL=http://$IP:$BROWSER_PORT + - unset MAILBOX_AUTO1 + - unset MAILBOX_AUTO2 + - unset MAILBOX_MANUAL1 + - unset MAILBOX_MANUAL2 + - script/build/test_slice_tests.sh 4 + - RAILS_ENV=test rake db:create + - script/bootstrap.sh + - 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 + test:browser:integration:twitter_chrome: stage: browser dependencies: diff --git a/script/build/test_slice_tests.sh b/script/build/test_slice_tests.sh index 8c5a70e74..dbd04ea42 100755 --- a/script/build/test_slice_tests.sh +++ b/script/build/test_slice_tests.sh @@ -5,28 +5,47 @@ if [ "$LEVEL" == '1' ]; then echo "slicing level 1" # no ticket action + # test/browser/aab_basic_urls_test.rb + # test/browser/aab_unit_test.rb + # test/browser/aac_basic_richtext_test.rb + # test/browser/abb_one_group_test.rb rm test/browser/admin_channel_email_test.rb rm test/browser/admin_overview_test.rb - rm test/browser/agent_user_profile_test.rb + # test/browser/agent_navigation_and_title_test.rb rm test/browser/agent_organization_profile_test.rb rm test/browser/agent_ticket_*.rb + # test/browser/agent_user_manage_test.rb + rm test/browser/agent_user_profile_test.rb + # test/browser/auth_test.rb rm test/browser/chat_test.rb + rm test/browser/customer_ticket_create_test.rb rm test/browser/first_steps_test.rb + # test/browser/form_test.rb rm test/browser/keyboard_shortcuts_test.rb + # test/browser/maintenance_app_version_test.rb + # test/browser/maintenance_message_test.rb rm test/browser/prefereces_test.rb rm test/browser/setting_test.rb + # test/browser/signup_password_change_and_reset_test.rb + # test/browser/swich_to_user_test.rb + # test/browser/taskbar_session_test.rb + # test/browser/taskbar_task_test.rb + # test/browser/translation_test.rb elif [ "$LEVEL" == '2' ]; then echo "slicing level 2" - # only ticket action + # only ticket action 1/2 + rm test/browser/aab_basic_urls_test.rb rm test/browser/aab_unit_test.rb rm test/browser/aac_basic_richtext_test.rb - rm test/browser/aab_basic_urls_test.rb + # test/browser/abb_one_group_test.rb rm test/browser/admin_channel_email_test.rb rm test/browser/admin_overview_test.rb rm test/browser/agent_navigation_and_title_test.rb rm test/browser/agent_organization_profile_test.rb + # test/browser/agent_ticket_actions_*.rb + rm test/browser/agent_ticket_overview_*.rb rm test/browser/agent_user_*.rb rm test/browser/auth_test.rb rm test/browser/chat_test.rb @@ -47,18 +66,59 @@ elif [ "$LEVEL" == '2' ]; then elif [ "$LEVEL" == '3' ]; then echo "slicing level 3" - # only profile action + # only ticket action 2/2 + rm test/browser/aab_basic_urls_test.rb rm test/browser/aab_unit_test.rb rm test/browser/aac_basic_richtext_test.rb - rm test/browser/aab_basic_urls_test.rb + # test/browser/abb_one_group_test.rb + rm test/browser/admin_channel_email_test.rb + rm test/browser/admin_overview_test.rb rm test/browser/agent_navigation_and_title_test.rb - rm test/browser/agent_user_manage_test.rb - rm test/browser/agent_ticket_*.rb + rm test/browser/agent_organization_profile_test.rb + rm test/browser/agent_ticket_actions_*.rb + # test/browser/agent_ticket_overview_*.rb + rm test/browser/agent_user_*.rb rm test/browser/auth_test.rb - rm test/browser/customer_ticket_create_test.rb + # test/browser/chat_test.rb + # test/browser/customer_ticket_create_test.rb + rm test/browser/first_steps_test.rb rm test/browser/form_test.rb + rm test/browser/keyboard_shortcuts_test.rb rm test/browser/maintenance_*.rb rm test/browser/manage_test.rb + rm test/browser/prefereces_test.rb + rm test/browser/setting_test.rb + rm test/browser/signup_password_change_and_reset_test.rb + rm test/browser/switch_to_user_test.rb + rm test/browser/taskbar_session_test.rb + rm test/browser/taskbar_task_test.rb + rm test/browser/translation_test.rb + +elif [ "$LEVEL" == '4' ]; then + echo "slicing level 4" + + # only profile action & admin + rm test/browser/aab_basic_urls_test.rb + rm test/browser/aab_unit_test.rb + rm test/browser/aac_basic_richtext_test.rb + # test/browser/abb_one_group_test.rb + # test/browser/admin_channel_email_test.rb + # test/browser/admin_overview_test.rb + rm test/browser/agent_navigation_and_title_test.rb + # test/browser/agent_organization_profile_test.rb + rm test/browser/agent_ticket_*.rb + rm test/browser/agent_user_manage_test.rb + # test/browser/agent_user_profile_test.rb + rm test/browser/auth_test.rb + rm test/browser/chat_test.rb + rm test/browser/customer_ticket_create_test.rb + # test/browser/first_steps_test.rb + rm test/browser/form_test.rb + # test/browser/keyboard_shortcuts_test.rb + rm test/browser/maintenance_*.rb + rm test/browser/manage_test.rb + # test/browser/preferences_test.rb + # test/browser/setting_test.rb rm test/browser/signup_password_change_and_reset_test.rb rm test/browser/switch_to_user_test.rb rm test/browser/taskbar_session_test.rb