summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-03-03 10:17:20 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-03-03 10:17:20 +0000
commit859a9cd9a65a2b862145efafd8716613fda29cd7 (patch)
treeaa1f977cccdd185cf1a8fccf28fc0ee580ccf0d8 /spec/factories
parentb18646040c9b17c69ac66fb687b02450e161808c (diff)
parentf0ba1ea3c1157d9aae472872481982ac53fb90a8 (diff)
downloadgitlab-ce-859a9cd9a65a2b862145efafd8716613fda29cd7.tar.gz
Merge branch 'fix/gb/fix-build-retry-tags-assignment' into 'master'
Fix runner tags assignment when retrying a job Closes #28846 See merge request !9612
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/ci/builds.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index a90534d10ba..cabe128acf7 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -76,6 +76,18 @@ FactoryGirl.define do
manual
end
+ trait :tags do
+ tag_list [:docker, :ruby]
+ end
+
+ trait :on_tag do
+ tag true
+ end
+
+ trait :triggered do
+ trigger_request factory: :ci_trigger_request_with_variables
+ end
+
after(:build) do |build, evaluator|
build.project = build.pipeline.project
end