diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-09-17 20:00:29 +0900 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-10-02 17:02:11 +0200 |
commit | c03631a99618d43c66a1b9d0b4303d7253e45866 (patch) | |
tree | 87026d6cff994f3ed05ab3911cc8fc68dd52532a /lib/gitlab/ci | |
parent | 3fc4c096a592fbc0af3a8d60d2026ed673126a2f (diff) | |
download | gitlab-ce-c03631a99618d43c66a1b9d0b4303d7253e45866.tar.gz |
Support new syntax
Diffstat (limited to 'lib/gitlab/ci')
-rw-r--r-- | lib/gitlab/ci/config/entry/job.rb | 12 | ||||
-rw-r--r-- | lib/gitlab/ci/status/build/delayed.rb (renamed from lib/gitlab/ci/status/build/manual_with_auto_play.rb) | 4 | ||||
-rw-r--r-- | lib/gitlab/ci/status/build/factory.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb index 4376eb91a73..fa64041f7db 100644 --- a/lib/gitlab/ci/config/entry/job.rb +++ b/lib/gitlab/ci/config/entry/job.rb @@ -10,7 +10,7 @@ module Gitlab include Attributable ALLOWED_KEYS = %i[tags script only except type image services - allow_failure type stage when autoplay_in artifacts cache + allow_failure type stage when start_in artifacts cache dependencies before_script after_script variables environment coverage retry extends].freeze @@ -28,7 +28,7 @@ module Gitlab greater_than_or_equal_to: 0, less_than_or_equal_to: 2 } validates :when, - inclusion: { in: %w[on_success on_failure always manual], + inclusion: { in: %w[on_success on_failure always manual delayed], message: 'should be on_success, on_failure, ' \ 'always or manual' } @@ -36,11 +36,11 @@ module Gitlab validates :extends, type: String with_options if: :manual_action? do - validates :autoplay_in, duration: true, allow_nil: true + validates :start_in, duration: true, allow_nil: true end with_options unless: :manual_action? do - validates :autoplay_in, presence: false + validates :start_in, presence: false end end end @@ -92,7 +92,7 @@ module Gitlab :artifacts, :commands, :environment, :coverage, :retry attributes :script, :tags, :allow_failure, :when, :dependencies, - :retry, :extends, :autoplay_in + :retry, :extends, :start_in def compose!(deps = nil) super do @@ -119,7 +119,7 @@ module Gitlab end def manual_action? - self.when == 'manual' + self.when == 'manual' || self.when == 'delayed' end def ignored? diff --git a/lib/gitlab/ci/status/build/manual_with_auto_play.rb b/lib/gitlab/ci/status/build/delayed.rb index f34f0be5d45..553d4cf8a71 100644 --- a/lib/gitlab/ci/status/build/manual_with_auto_play.rb +++ b/lib/gitlab/ci/status/build/delayed.rb @@ -2,7 +2,7 @@ module Gitlab module Ci module Status module Build - class ManualWithAutoPlay < Status::Extended + class Delayed < Status::Extended ### # TODO: Those are random values. We have to fix accoding to the UX review ### @@ -43,7 +43,7 @@ module Gitlab end def self.matches?(build, user) - build.autoplay? && !build.canceled? + build.delayed? && !build.canceled? end end end diff --git a/lib/gitlab/ci/status/build/factory.rb b/lib/gitlab/ci/status/build/factory.rb index e1b40472fc5..0fbab6e7673 100644 --- a/lib/gitlab/ci/status/build/factory.rb +++ b/lib/gitlab/ci/status/build/factory.rb @@ -5,7 +5,7 @@ module Gitlab class Factory < Status::Factory def self.extended_statuses [[Status::Build::Erased, - Status::Build::ManualWithAutoPlay, + Status::Build::Delayed, Status::Build::Manual, Status::Build::Canceled, Status::Build::Created, diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index 5277b69a628..1dc6c28d24a 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -50,7 +50,7 @@ module Gitlab after_script: job[:after_script], environment: job[:environment], retry: job[:retry], - autoplay_in: job[:autoplay_in], + start_in: job[:start_in], }.compact } end |