Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2019-03-12 20:26:07 +0300
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-03-13 16:28:52 +0300
commit745fc6773681cd77a732c7b3273c84df2272bd18 (patch)
tree352e4ba8bf00eb5767be9cbebf0a832a9adb09f1
parentb610bb501bd785d80288a5fa771415e605eddfd9 (diff)
Merge branch 'ce-9826-fix-broken-downstreams-backport-factory' into 'master'
Backports EE change for expanded pipelines See merge request gitlab-org/gitlab-ce!26043 (cherry picked from commit 30e52b239ce9ac7ba83778e00f4b45d65e61a4a0) f8bac850 Backports EE change for expanded pipelines
-rw-r--r--spec/factories/ci/pipelines.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 8a44ce52849..ee5d27355f1 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -82,6 +82,12 @@ FactoryBot.define do
end
end
+ trait :with_job do
+ after(:build) do |pipeline, evaluator|
+ pipeline.builds << build(:ci_build, pipeline: pipeline, project: pipeline.project)
+ end
+ end
+
trait :auto_devops_source do
config_source { Ci::Pipeline.config_sources[:auto_devops_source] }
end