Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/gitlab/ci/pipeline/seed/build.rb b/lib/gitlab/ci/pipeline/seed/build.rb
index c393fed26de..934bf22d8ad 100644
--- a/lib/gitlab/ci/pipeline/seed/build.rb
+++ b/lib/gitlab/ci/pipeline/seed/build.rb
@@ -15,12 +15,7 @@ module Gitlab
             @context = context
             @pipeline = context.pipeline
             @seed_attributes = attributes
-            @stages_for_needs_lookup = if Feature.enabled?(:ci_same_stage_job_needs, @pipeline.project, default_enabled: :yaml)
-                                         (previous_stages + [current_stage]).compact
-                                       else
-                                         previous_stages
-                                       end
-
+            @stages_for_needs_lookup = (previous_stages + [current_stage]).compact
             @needs_attributes = dig(:needs_attributes)
             @resource_group_key = attributes.delete(:resource_group_key)
             @job_variables = @seed_attributes.delete(:job_variables)
@@ -123,6 +118,8 @@ module Gitlab
               return { environment: nil }
             end
 
+            build.persisted_environment = environment
+
             {
               deployment: Seed::Deployment.new(build, environment).to_resource,
               metadata_attributes: {