Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/gitlab/ci/variables/builder.rb b/lib/gitlab/ci/variables/builder.rb
index 33a1948b79d..f16abf6cf49 100644
--- a/lib/gitlab/ci/variables/builder.rb
+++ b/lib/gitlab/ci/variables/builder.rb
@@ -28,7 +28,7 @@ module Gitlab
             variables.concat(secret_project_variables(environment: environment))
             variables.concat(job.trigger_request.user_variables) if job.trigger_request
             variables.concat(pipeline.variables)
-            variables.concat(pipeline.pipeline_schedule.job_variables) if pipeline.pipeline_schedule
+            variables.concat(pipeline_schedule_variables)
           end
         end
 
@@ -120,6 +120,18 @@ module Gitlab
           end
         end
 
+        def pipeline_schedule_variables
+          strong_memoize(:pipeline_schedule_variables) do
+            variables = if pipeline.pipeline_schedule
+                          pipeline.pipeline_schedule.job_variables
+                        else
+                          []
+                        end
+
+            Gitlab::Ci::Variables::Collection.new(variables)
+          end
+        end
+
         def ci_node_total_value(job)
           parallel = job.options&.dig(:parallel)
           parallel = parallel.dig(:total) if parallel.is_a?(Hash)