1 files changed, 13 insertions, 3 deletions
diff --git a/lib/gitlab/ci/pipeline/seed/environment.rb b/lib/gitlab/ci/pipeline/seed/environment.rb
index 6bcc71a808b..8353bc523bf 100644
--- a/lib/gitlab/ci/pipeline/seed/environment.rb
+++ b/lib/gitlab/ci/pipeline/seed/environment.rb
@@ -5,17 +5,21 @@ module Gitlab
     module Pipeline
       module Seed
         class Environment < Seed::Base
-          attr_reader :job
+          attr_reader :job, :merge_request
 
-          def initialize(job)
+          delegate :simple_variables, to: :job
+
+          def initialize(job, merge_request: nil)
             @job = job
+            @merge_request = merge_request
           end
 
           def to_resource
             environments.safe_find_or_create_by(name: expanded_environment_name) do |environment|
               # Initialize the attributes at creation
-              environment.auto_stop_in = auto_stop_in
+              environment.auto_stop_in = expanded_auto_stop_in
               environment.tier = deployment_tier
+              environment.merge_request = merge_request
             end
           end
 
@@ -36,6 +40,12 @@ module Gitlab
           def expanded_environment_name
             job.expanded_environment_name
           end
+
+          def expanded_auto_stop_in
+            return unless auto_stop_in
+
+            ExpandVariables.expand(auto_stop_in, -> { simple_variables.sort_and_expand_all })
+          end
         end
       end
     end