Do not implement CI/CD job to stage association yet

3 files changed, 5 insertions, 24 deletions

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index efb5cbd9d41..d7418a07177 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -38,22 +38,15 @@ class CommitStatus < ActiveRecord::Base
   scope :retried_ordered, -> { retried.ordered.includes(project: :namespace) }
   scope :after_stage, -> (index) { where('stage_idx > ?', index) }
 
-  ##
-  # TODO, we will change this to `belongs_to :stage` when we phase out
-  # `ci_builds.stage` attribute and migrate `ci_builds.stage_id` reference in
-  # one of upcoming releases.
-  #
-  belongs_to :stage_entity, foreign_key: :stage_id, class_name: 'Ci::Stage'
-
   state_machine :status do
-    event :enqueue do
-      transition [:created, :skipped, :manual] => :pending
-    end
-
     event :process do
       transition [:skipped, :manual] => :created
     end
 
+    event :enqueue do
+      transition [:created, :skipped, :manual] => :pending
+    end
+
     event :run do
       transition pending: :running
     end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index f54e1131813..f173e2c142a 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -408,18 +408,6 @@ describe CommitStatus, :models do
     end
   end
 
-  describe '#stage_entity' do
-    let(:stage) { create(:ci_stage_entity) }
-
-    let(:commit_status) do
-      create(:commit_status, stage_id: stage.id)
-    end
-
-    it 'has a correct association with persisted stage' do
-      expect(commit_status.stage_entity).to eq stage
-    end
-  end
-
   describe '#locking_enabled?' do
     before do
       commit_status.lock_version = 100
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index a0e83deeb54..ef9927c5969 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -22,7 +22,7 @@ describe Ci::RetryBuildService, :services do
     %i[type lock_version target_url base_tags
        commit_id deployments erased_by_id last_deployment project_id
        runner_id tag_taggings taggings tags trigger_request_id
-       user_id auto_canceled_by_id retried stage_entity].freeze
+       user_id auto_canceled_by_id retried].freeze
 
   shared_examples 'build duplication' do
     let(:stage) do