#390: misprint
This commit is contained in:
parent
b55e9bf25a
commit
fdac169149
|
@ -15,7 +15,7 @@ RosaABF.controller('BuildListsController', ['$scope', '$http', '$location', '$ti
|
|||
<%=BuildList::BUILD_CANCELING%>: 10,
|
||||
<%=BuildList::BUILD_CANCELED%>: 9,
|
||||
<%=BuildList::BUILD_STARTED%>: 8,
|
||||
<%=BuildList::RERUNINNG_TESTS%>: 7,
|
||||
<%=BuildList::RERUNNING_TESTS%>: 7,
|
||||
<%=BuildList::BUILD_PUBLISH%>: 6,
|
||||
<%=BuildList::BUILD_PUBLISHED%>: 5,
|
||||
<%=BuildList::BUILD_ERROR%>: 4,
|
||||
|
|
|
@ -87,7 +87,7 @@ class BuildList < ActiveRecord::Base
|
|||
%w(WAITING_FOR_RESPONSE 4000),
|
||||
%w(BUILD_PENDING 2000),
|
||||
%w(RERUN_TESTS 2500),
|
||||
%w(RERUNINNG_TESTS 2550),
|
||||
%w(RERUNNING_TESTS 2550),
|
||||
%w(BUILD_PUBLISHED 6000),
|
||||
%w(BUILD_PUBLISH 7000),
|
||||
%w(FAILED_PUBLISH 8000),
|
||||
|
@ -186,19 +186,19 @@ class BuildList < ActiveRecord::Base
|
|||
|
||||
event :start_build do
|
||||
transition build_pending: :build_started
|
||||
transition rerun_tests: :reruninng_tests
|
||||
transition rerun_tests: :rerunning_tests
|
||||
end
|
||||
|
||||
event :cancel do
|
||||
transition [:build_pending, :build_started] => :build_canceling
|
||||
transition [:rerun_tests, :reruninng_tests] => :tests_failed
|
||||
transition [:rerun_tests, :rerunning_tests] => :tests_failed
|
||||
end
|
||||
|
||||
# build_canceling: :build_canceled - canceling from UI
|
||||
# build_started: :build_canceled - canceling from worker by time-out (time_living has been expired)
|
||||
event :build_canceled do
|
||||
transition [:build_canceling, :build_started, :build_pending] => :build_canceled
|
||||
transition [:rerun_tests, :reruninng_tests] => :tests_failed
|
||||
transition [:rerun_tests, :rerunning_tests] => :tests_failed
|
||||
end
|
||||
|
||||
event :published do
|
||||
|
@ -255,13 +255,13 @@ class BuildList < ActiveRecord::Base
|
|||
# ===== into testing - end
|
||||
|
||||
event :build_success do
|
||||
transition [:build_started, :build_canceling, :build_canceled, :reruninng_tests] => :success
|
||||
transition [:build_started, :build_canceling, :build_canceled, :rerunning_tests] => :success
|
||||
end
|
||||
|
||||
[:build_error, :tests_failed].each do |kind|
|
||||
event kind do
|
||||
transition [:build_started, :build_canceling, :build_canceled] => kind
|
||||
transition reruninng_tests: :tests_failed
|
||||
transition rerunning_tests: :tests_failed
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ en:
|
|||
statuses:
|
||||
build_lists: All
|
||||
rerun_tests: Rerun tests
|
||||
reruninng_tests: Build is being rerun tests
|
||||
rerunning_tests: Build is being rerun tests
|
||||
build_error: Build error
|
||||
build_published: Build has been published
|
||||
tests_failed: Tests failed
|
||||
|
|
|
@ -146,7 +146,7 @@ ru:
|
|||
statuses:
|
||||
build_lists: Всего
|
||||
rerun_tests: перезапуск тестов
|
||||
reruninng_tests: тесты перезапускаются
|
||||
rerunning_tests: тесты перезапускаются
|
||||
build_error: ошибка сборки
|
||||
build_published: опубликован
|
||||
tests_failed: тесты не прошли
|
||||
|
|
|
@ -18,7 +18,7 @@ module AbfWorker
|
|||
item = find_or_create_item
|
||||
fill_container_data if status != STARTED
|
||||
|
||||
reruninng_tests = subject.reruninng_tests?
|
||||
rerunning_tests = subject.rerunning_tests?
|
||||
|
||||
case status
|
||||
when COMPLETED
|
||||
|
@ -30,17 +30,17 @@ module AbfWorker
|
|||
end
|
||||
when FAILED
|
||||
subject.build_error
|
||||
item.update_attributes({status: BuildList::BUILD_ERROR}) unless reruninng_tests
|
||||
item.update_attributes({status: BuildList::BUILD_ERROR}) unless rerunning_tests
|
||||
when STARTED
|
||||
subject.start_build
|
||||
when CANCELED
|
||||
item.update_attributes({status: BuildList::BUILD_CANCELED}) unless reruninng_tests || subject.tests_failed?
|
||||
item.update_attributes({status: BuildList::BUILD_CANCELED}) unless rerunning_tests || subject.tests_failed?
|
||||
subject.build_canceled
|
||||
when TESTS_FAILED
|
||||
subject.tests_failed
|
||||
end
|
||||
|
||||
if !reruninng_tests && [TESTS_FAILED, COMPLETED].include?(status)
|
||||
if !rerunning_tests && [TESTS_FAILED, COMPLETED].include?(status)
|
||||
item.update_attributes({status: BuildList::SUCCESS})
|
||||
subject.publish_container if subject.auto_create_container?
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue