summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/config/node/job.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ci/config/node/job.rb')
-rw-r--r--lib/gitlab/ci/config/node/job.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/node/job.rb b/lib/gitlab/ci/config/node/job.rb
index c0ec2236231..464abd4d2d8 100644
--- a/lib/gitlab/ci/config/node/job.rb
+++ b/lib/gitlab/ci/config/node/job.rb
@@ -9,7 +9,7 @@ module Gitlab
include Configurable
include Attributable
- attributes :tags, :allow_failure
+ attributes :tags, :allow_failure, :when, :environment
validations do
validates :config, allowed_keys:
@@ -24,6 +24,18 @@ module Gitlab
with_options allow_nil: true do
validates :tags, array_of_strings: true
validates :allow_failure, boolean: true
+ validates :when,
+ inclusion: { in: %w[on_success on_failure always],
+ message: 'should be on_success, on_failure ' \
+ 'or always' }
+ validates :environment,
+ type: {
+ with: String,
+ message: Gitlab::Regex.environment_name_regex_message }
+ validates :environment,
+ format: {
+ with: Gitlab::Regex.environment_name_regex,
+ message: Gitlab::Regex.environment_name_regex_message }
end
end