diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-19 15:49:54 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-19 15:49:54 +0300 |
commit | 61e7453e0465ceb631d3e8445429cfed7c1449d3 (patch) | |
tree | f20fabfca0a5d7cdf694f1df69c88788b3f8eb65 /spec/factories/ci | |
parent | ad14c1bf85f716ed698e8802161de74f462a106c (diff) | |
parent | 72229c375fb3efe9dd28c0bf98f0df7696d99fc2 (diff) |
Merge branch 'manual-actions' into 'master'
Add support for manual CI actions
## What does this MR do?
This implements a `when: manual` which allows a jobs to be marked as manual actions.
Manual actions have to be explicitly executed by developers.
## What are the relevant issue numbers?
This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010
See merge request !5297
Diffstat (limited to 'spec/factories/ci')
-rw-r--r-- | spec/factories/ci/builds.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 5fb671df570..fb111889501 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -43,6 +43,11 @@ FactoryGirl.define do status 'pending' end + trait :manual do + status 'skipped' + self.when 'manual' + end + trait :allowed_to_fail do allow_failure true end |