Commit c9da4375 authored by Nick Thomas's avatar Nick Thomas

Merge branch '62760-persistent-failure-in-spec-models-ci-pipeline_schedule_spec-rb' into 'master'

Resolve "Persistent failure in spec/models/ci/pipeline_schedule_spec.rb"

Closes #62760

See merge request gitlab-org/gitlab-ce!29191
parents cb18dfea 690c4259
...@@ -97,7 +97,7 @@ describe Ci::PipelineSchedule do ...@@ -97,7 +97,7 @@ describe Ci::PipelineSchedule do
let(:cron_worker_next_run_at) do let(:cron_worker_next_run_at) do
Gitlab::Ci::CronParser.new(Settings.cron_jobs['pipeline_schedule_worker']['cron'], Time.zone.name) Gitlab::Ci::CronParser.new(Settings.cron_jobs['pipeline_schedule_worker']['cron'], Time.zone.name)
.next_time_from(Time.now) .next_time_from(Time.zone.now)
end end
context 'when creates new pipeline schedule' do context 'when creates new pipeline schedule' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment