Commit e58e24b4 authored by Kamil Trzciński's avatar Kamil Trzciński

Revert "Merge branch..."

This reverts merge request !27503
parent d9a761ed
...@@ -343,7 +343,7 @@ module Ci ...@@ -343,7 +343,7 @@ module Ci
end end
def retryable? def retryable?
!archived? && (success? || failed?) !archived? && (success? || failed? || canceled?)
end end
def retries_count def retries_count
......
...@@ -270,9 +270,6 @@ Clicking on an individual job will show you its job trace, and allow you to: ...@@ -270,9 +270,6 @@ Clicking on an individual job will show you its job trace, and allow you to:
- Retry the job. - Retry the job.
- Erase the job trace. - Erase the job trace.
NOTE: **Note:**
To prevent jobs from being bypassed or run out of order, canceled jobs can only be retried when the whole pipeline they belong to is retried.
### Seeing the failure reason for jobs ### Seeing the failure reason for jobs
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17782) in GitLab 10.7. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17782) in GitLab 10.7.
......
...@@ -936,8 +936,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -936,8 +936,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
find('.js-cancel-job').click find('.js-cancel-job').click
end end
it 'loads the page and shows no controls' do it 'loads the page and shows all needed controls' do
expect(page).not_to have_content 'Retry' expect(page).to have_content 'Retry'
end end
end end
end end
...@@ -946,7 +946,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -946,7 +946,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
context "Job from project", :js do context "Job from project", :js do
before do before do
job.run! job.run!
job.drop!(:script_failure) job.cancel!
visit project_job_path(project, job) visit project_job_path(project, job)
wait_for_requests wait_for_requests
......
...@@ -115,11 +115,11 @@ describe 'Pipeline', :js do ...@@ -115,11 +115,11 @@ describe 'Pipeline', :js do
end end
end end
it 'cancels the running build and does not show retry button' do it 'cancels the running build and shows retry button' do
find('#ci-badge-deploy .ci-action-icon-container').click find('#ci-badge-deploy .ci-action-icon-container').click
page.within('#ci-badge-deploy') do page.within('#ci-badge-deploy') do
expect(page).not_to have_css('.js-icon-retry') expect(page).to have_css('.js-icon-retry')
end end
end end
end end
...@@ -133,11 +133,11 @@ describe 'Pipeline', :js do ...@@ -133,11 +133,11 @@ describe 'Pipeline', :js do
end end
end end
it 'cancels the preparing build and does not show retry button' do it 'cancels the preparing build and shows retry button' do
find('#ci-badge-deploy .ci-action-icon-container').click find('#ci-badge-deploy .ci-action-icon-container').click
page.within('#ci-badge-deploy') do page.within('#ci-badge-deploy') do
expect(page).not_to have_css('.js-icon-retry') expect(page).to have_css('.js-icon-retry')
end end
end end
end end
......
...@@ -163,11 +163,11 @@ describe Gitlab::Ci::Status::Build::Factory do ...@@ -163,11 +163,11 @@ describe Gitlab::Ci::Status::Build::Factory do
it 'matches correct extended statuses' do it 'matches correct extended statuses' do
expect(factory.extended_statuses) expect(factory.extended_statuses)
.to eq [Gitlab::Ci::Status::Build::Canceled] .to eq [Gitlab::Ci::Status::Build::Canceled, Gitlab::Ci::Status::Build::Retryable]
end end
it 'does not fabricate a retryable build status' do it 'fabricates a retryable build status' do
expect(status).not_to be_a Gitlab::Ci::Status::Build::Retryable expect(status).to be_a Gitlab::Ci::Status::Build::Retryable
end end
it 'fabricates status with correct details' do it 'fabricates status with correct details' do
...@@ -177,7 +177,7 @@ describe Gitlab::Ci::Status::Build::Factory do ...@@ -177,7 +177,7 @@ describe Gitlab::Ci::Status::Build::Factory do
expect(status.illustration).to include(:image, :size, :title) expect(status.illustration).to include(:image, :size, :title)
expect(status.label).to eq 'canceled' expect(status.label).to eq 'canceled'
expect(status).to have_details expect(status).to have_details
expect(status).not_to have_action expect(status).to have_action
end end
end end
......
...@@ -1294,7 +1294,7 @@ describe Ci::Build do ...@@ -1294,7 +1294,7 @@ describe Ci::Build do
build.cancel! build.cancel!
end end
it { is_expected.not_to be_retryable } it { is_expected.to be_retryable }
end end
end end
...@@ -1824,7 +1824,7 @@ describe Ci::Build do ...@@ -1824,7 +1824,7 @@ describe Ci::Build do
context 'when build has been canceled' do context 'when build has been canceled' do
subject { build_stubbed(:ci_build, :manual, status: :canceled) } subject { build_stubbed(:ci_build, :manual, status: :canceled) }
it { is_expected.not_to be_playable } it { is_expected.to be_playable }
end end
context 'when build is successful' do context 'when build is successful' do
......
...@@ -864,7 +864,7 @@ describe API::Jobs do ...@@ -864,7 +864,7 @@ describe API::Jobs do
end end
describe 'POST /projects/:id/jobs/:job_id/retry' do describe 'POST /projects/:id/jobs/:job_id/retry' do
let(:job) { create(:ci_build, :failed, pipeline: pipeline) } let(:job) { create(:ci_build, :canceled, pipeline: pipeline) }
before do before do
post api("/projects/#{project.id}/jobs/#{job.id}/retry", api_user) post api("/projects/#{project.id}/jobs/#{job.id}/retry", api_user)
...@@ -874,7 +874,7 @@ describe API::Jobs do ...@@ -874,7 +874,7 @@ describe API::Jobs do
context 'user with :update_build permission' do context 'user with :update_build permission' do
it 'retries non-running job' do it 'retries non-running job' do
expect(response).to have_gitlab_http_status(201) expect(response).to have_gitlab_http_status(201)
expect(project.builds.first.status).to eq('failed') expect(project.builds.first.status).to eq('canceled')
expect(json_response['status']).to eq('pending') expect(json_response['status']).to eq('pending')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment