before_create :set_project. Now TriggerSchedule saves project from parent
This commit is contained in:
parent
ea8574fd37
commit
4131ed2bd8
|
@ -15,11 +15,15 @@ module Ci
|
||||||
validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
|
validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
|
||||||
validates :ref, presence: { unless: :importing? }
|
validates :ref, presence: { unless: :importing? }
|
||||||
|
|
||||||
|
before_create :set_project
|
||||||
before_save :set_next_run_at
|
before_save :set_next_run_at
|
||||||
|
|
||||||
|
def set_project
|
||||||
|
self.project = trigger.project
|
||||||
|
end
|
||||||
|
|
||||||
def set_next_run_at
|
def set_next_run_at
|
||||||
self.next_run_at = Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now)
|
self.next_run_at = Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now)
|
||||||
self.project = trigger.project
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def schedule_next_run!
|
def schedule_next_run!
|
||||||
|
|
|
@ -4,10 +4,6 @@ FactoryGirl.define do
|
||||||
cron '0 1 * * *'
|
cron '0 1 * * *'
|
||||||
cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
|
cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
|
||||||
|
|
||||||
after(:build) do |trigger_schedule, evaluator|
|
|
||||||
trigger_schedule.update!(project: trigger_schedule.trigger.project)
|
|
||||||
end
|
|
||||||
|
|
||||||
trait :nightly do
|
trait :nightly do
|
||||||
cron '0 1 * * *'
|
cron '0 1 * * *'
|
||||||
cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
|
cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
|
||||||
|
|
Loading…
Reference in New Issue