Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/gitlab/ci/yaml_processor/result.rb b/lib/gitlab/ci/yaml_processor/result.rb
index f96a6629849..460fad16d5c 100644
--- a/lib/gitlab/ci/yaml_processor/result.rb
+++ b/lib/gitlab/ci/yaml_processor/result.rb
@@ -111,6 +111,22 @@ module Gitlab
           @ci_config.variables_with_data
         end
 
+        def yaml_variables_for(job_name)
+          job = jobs.fetch(job_name)
+
+          Gitlab::Ci::Variables::Helpers.inherit_yaml_variables(
+            from: root_variables,
+            to: transform_to_yaml_variables(job[:job_variables]),
+            inheritance: job.fetch(:root_variables_inheritance, true)
+          )
+        end
+
+        def stage_for(job_name)
+          job = jobs.fetch(job_name)
+
+          job[:stage]
+        end
+
         private
 
         def variables