diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/services/ci/process_build_service_spec.rb | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/services/ci/process_build_service_spec.rb')
-rw-r--r-- | spec/services/ci/process_build_service_spec.rb | 189 |
1 files changed, 80 insertions, 109 deletions
diff --git a/spec/services/ci/process_build_service_spec.rb b/spec/services/ci/process_build_service_spec.rb index 2fcb4ce73ff..9301098b083 100644 --- a/spec/services/ci/process_build_service_spec.rb +++ b/spec/services/ci/process_build_service_spec.rb @@ -2,147 +2,118 @@ require 'spec_helper' RSpec.describe Ci::ProcessBuildService, '#execute' do - let(:user) { create(:user) } - let(:project) { create(:project) } + using RSpec::Parameterized::TableSyntax + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } + let_it_be(:pipeline) { create(:ci_pipeline, ref: 'master', project: project) } subject { described_class.new(project, user).execute(build, current_status) } - before do + before_all do project.add_maintainer(user) end - context 'when build has on_success option' do - let(:build) { create(:ci_build, :created, when: :on_success, user: user, project: project) } - - context 'when current status is success' do - let(:current_status) { 'success' } - - it 'changes the build status' do - expect { subject }.to change { build.status }.to('pending') - end - end - - context 'when current status is skipped' do - let(:current_status) { 'skipped' } - - it 'changes the build status' do - expect { subject }.to change { build.status }.to('pending') - end - end - - context 'when current status is failed' do - let(:current_status) { 'failed' } - - it 'does not change the build status' do - expect { subject }.to change { build.status }.to('skipped') - end + shared_context 'with enqueue_immediately set' do + before do + build.set_enqueue_immediately! end end - context 'when build has on_failure option' do - let(:build) { create(:ci_build, :created, when: :on_failure, user: user, project: project) } - - context 'when current status is success' do - let(:current_status) { 'success' } - - it 'changes the build status' do - expect { subject }.to change { build.status }.to('skipped') - end - end - - context 'when current status is failed' do - let(:current_status) { 'failed' } - - it 'does not change the build status' do - expect { subject }.to change { build.status }.to('pending') - end + shared_context 'with ci_retry_job_fix disabled' do + before do + stub_feature_flags(ci_retry_job_fix: false) end end - context 'when build has always option' do - let(:build) { create(:ci_build, :created, when: :always, user: user, project: project) } - - context 'when current status is success' do - let(:current_status) { 'success' } - - it 'changes the build status' do - expect { subject }.to change { build.status }.to('pending') - end + context 'for single build' do + let!(:build) { create(:ci_build, *[trait].compact, :created, **conditions, pipeline: pipeline) } + + where(:trait, :conditions, :current_status, :after_status, :retry_after_status, :retry_disabled_after_status) do + nil | { when: :on_success } | 'success' | 'pending' | 'pending' | 'pending' + nil | { when: :on_success } | 'skipped' | 'pending' | 'pending' | 'pending' + nil | { when: :on_success } | 'failed' | 'skipped' | 'skipped' | 'skipped' + nil | { when: :on_failure } | 'success' | 'skipped' | 'skipped' | 'skipped' + nil | { when: :on_failure } | 'skipped' | 'skipped' | 'skipped' | 'skipped' + nil | { when: :on_failure } | 'failed' | 'pending' | 'pending' | 'pending' + nil | { when: :always } | 'success' | 'pending' | 'pending' | 'pending' + nil | { when: :always } | 'skipped' | 'pending' | 'pending' | 'pending' + nil | { when: :always } | 'failed' | 'pending' | 'pending' | 'pending' + :actionable | { when: :manual } | 'success' | 'manual' | 'pending' | 'manual' + :actionable | { when: :manual } | 'skipped' | 'manual' | 'pending' | 'manual' + :actionable | { when: :manual } | 'failed' | 'skipped' | 'skipped' | 'skipped' + :schedulable | { when: :delayed } | 'success' | 'scheduled' | 'pending' | 'scheduled' + :schedulable | { when: :delayed } | 'skipped' | 'scheduled' | 'pending' | 'scheduled' + :schedulable | { when: :delayed } | 'failed' | 'skipped' | 'skipped' | 'skipped' end - context 'when current status is failed' do - let(:current_status) { 'failed' } - - it 'does not change the build status' do - expect { subject }.to change { build.status }.to('pending') + with_them do + it 'updates the job status to after_status' do + expect { subject }.to change { build.status }.to(after_status) end - end - end - - context 'when build has manual option' do - let(:build) { create(:ci_build, :created, :actionable, user: user, project: project) } - context 'when current status is success' do - let(:current_status) { 'success' } + context 'when build is set to enqueue immediately' do + include_context 'with enqueue_immediately set' - it 'changes the build status' do - expect { subject }.to change { build.status }.to('manual') - end - end + it 'updates the job status to retry_after_status' do + expect { subject }.to change { build.status }.to(retry_after_status) + end - context 'when current status is failed' do - let(:current_status) { 'failed' } + context 'when feature flag ci_retry_job_fix is disabled' do + include_context 'with ci_retry_job_fix disabled' - it 'does not change the build status' do - expect { subject }.to change { build.status }.to('skipped') + it "updates the job status to retry_disabled_after_status" do + expect { subject }.to change { build.status }.to(retry_disabled_after_status) + end + end end end end - context 'when build has delayed option' do - before do - allow(Ci::BuildScheduleWorker).to receive(:perform_at) {} + context 'when build is scheduled with DAG' do + let!(:build) do + create( + :ci_build, + *[trait].compact, + :dependent, + :created, + when: build_when, + pipeline: pipeline, + needed: other_build + ) end - let(:build) { create(:ci_build, :created, :schedulable, user: user, project: project) } - - context 'when current status is success' do - let(:current_status) { 'success' } + let!(:other_build) { create(:ci_build, :created, when: :on_success, pipeline: pipeline) } - it 'changes the build status' do - expect { subject }.to change { build.status }.to('scheduled') - end + where(:trait, :build_when, :current_status, :after_status, :retry_after_status, :retry_disabled_after_status) do + nil | :on_success | 'success' | 'pending' | 'pending' | 'pending' + nil | :on_success | 'skipped' | 'skipped' | 'skipped' | 'skipped' + nil | :manual | 'success' | 'manual' | 'pending' | 'manual' + nil | :manual | 'skipped' | 'skipped' | 'skipped' | 'skipped' + nil | :delayed | 'success' | 'manual' | 'pending' | 'manual' + nil | :delayed | 'skipped' | 'skipped' | 'skipped' | 'skipped' + :schedulable | :delayed | 'success' | 'scheduled' | 'pending' | 'scheduled' + :schedulable | :delayed | 'skipped' | 'skipped' | 'skipped' | 'skipped' end - context 'when current status is failed' do - let(:current_status) { 'failed' } - - it 'does not change the build status' do - expect { subject }.to change { build.status }.to('skipped') + with_them do + it 'updates the job status to after_status' do + expect { subject }.to change { build.status }.to(after_status) end - end - end - context 'when build is scheduled with DAG' do - using RSpec::Parameterized::TableSyntax + context 'when build is set to enqueue immediately' do + include_context 'with enqueue_immediately set' - let(:pipeline) { create(:ci_pipeline, ref: 'master', project: project) } - let!(:build) { create(:ci_build, :created, when: build_when, pipeline: pipeline, scheduling_type: :dag) } - let!(:other_build) { create(:ci_build, :created, when: :on_success, pipeline: pipeline) } - let!(:build_on_other_build) { create(:ci_build_need, build: build, name: other_build.name) } - - where(:build_when, :current_status, :after_status) do - :on_success | 'success' | 'pending' - :on_success | 'skipped' | 'skipped' - :manual | 'success' | 'manual' - :manual | 'skipped' | 'skipped' - :delayed | 'success' | 'manual' - :delayed | 'skipped' | 'skipped' - end + it 'updates the job status to retry_after_status' do + expect { subject }.to change { build.status }.to(retry_after_status) + end - with_them do - it 'proceeds the build' do - expect { subject }.to change { build.status }.to(after_status) + context 'when feature flag ci_retry_job_fix is disabled' do + include_context 'with ci_retry_job_fix disabled' + + it "updates the job status to retry_disabled_after_status" do + expect { subject }.to change { build.status }.to(retry_disabled_after_status) + end + end end end end |