Commit 86900f00 authored by Douwe Maan's avatar Douwe Maan

Merge branch...

Merge branch '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master'

Disable retrying cancelled jobs

Closes #53064

See merge request gitlab-org/gitlab-ce!27503
parents 743508bf d6cf6fd7
Pipeline #59404252 passed with stages
in 49 minutes and 51 seconds
......@@ -352,7 +352,7 @@ module Ci
end
def retryable?
!archived? && (success? || failed? || canceled?)
!archived? && (success? || failed?)
end
def retries_count
......
---
title: Make canceled jobs not retryable
merge_request: 27503
author:
type: changed
......@@ -266,6 +266,9 @@ Clicking on an individual job will show you its job trace, and allow you to:
- Retry the job.
- 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
> [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
find('.js-cancel-job').click
end
it 'loads the page and shows all needed controls' do
expect(page).to have_content 'Retry'
it 'loads the page and shows no controls' do
expect(page).not_to have_content 'Retry'
end
end
end
......@@ -946,7 +946,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
context "Job from project", :js do
before do
job.run!
job.cancel!
job.drop!(:script_failure)
visit project_job_path(project, job)
wait_for_requests
......
......@@ -115,11 +115,11 @@ describe 'Pipeline', :js do
end
end
it 'cancels the running build and shows retry button' do
it 'cancels the running build and does not show retry button' do
find('#ci-badge-deploy .ci-action-icon-container').click
page.within('#ci-badge-deploy') do
expect(page).to have_css('.js-icon-retry')
expect(page).not_to have_css('.js-icon-retry')
end
end
end
......@@ -133,11 +133,11 @@ describe 'Pipeline', :js do
end
end
it 'cancels the preparing build and shows retry button' do
it 'cancels the preparing build and does not show retry button' do
find('#ci-badge-deploy .ci-action-icon-container').click
page.within('#ci-badge-deploy') do
expect(page).to have_css('.js-icon-retry')
expect(page).not_to have_css('.js-icon-retry')
end
end
end
......
......@@ -163,11 +163,11 @@ describe Gitlab::Ci::Status::Build::Factory do
it 'matches correct extended statuses' do
expect(factory.extended_statuses)
.to eq [Gitlab::Ci::Status::Build::Canceled, Gitlab::Ci::Status::Build::Retryable]
.to eq [Gitlab::Ci::Status::Build::Canceled]
end
it 'fabricates a retryable build status' do
expect(status).to be_a Gitlab::Ci::Status::Build::Retryable
it 'does not fabricate a retryable build status' do
expect(status).not_to be_a Gitlab::Ci::Status::Build::Retryable
end
it 'fabricates status with correct details' do
......@@ -177,7 +177,7 @@ describe Gitlab::Ci::Status::Build::Factory do
expect(status.illustration).to include(:image, :size, :title)
expect(status.label).to eq 'canceled'
expect(status).to have_details
expect(status).to have_action
expect(status).not_to have_action
end
end
......
......@@ -1434,7 +1434,7 @@ describe Ci::Build do
build.cancel!
end
it { is_expected.to be_retryable }
it { is_expected.not_to be_retryable }
end
end
......@@ -1964,7 +1964,7 @@ describe Ci::Build do
context 'when build has been canceled' do
subject { build_stubbed(:ci_build, :manual, status: :canceled) }
it { is_expected.to be_playable }
it { is_expected.not_to be_playable }
end
context 'when build is successful' do
......
......@@ -863,7 +863,7 @@ describe API::Jobs do
end
describe 'POST /projects/:id/jobs/:job_id/retry' do
let(:job) { create(:ci_build, :canceled, pipeline: pipeline) }
let(:job) { create(:ci_build, :failed, pipeline: pipeline) }
before do
post api("/projects/#{project.id}/jobs/#{job.id}/retry", api_user)
......@@ -873,7 +873,7 @@ describe API::Jobs do
context 'user with :update_build permission' do
it 'retries non-running job' do
expect(response).to have_gitlab_http_status(201)
expect(project.builds.first.status).to eq('canceled')
expect(project.builds.first.status).to eq('failed')
expect(json_response['status']).to eq('pending')
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