Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 10 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index c2c215d7b5b..b3815b53c2b 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -420,8 +420,6 @@ FactoryBot.define do
     end
 
     trait :sast do
-      name { "sast" }
-
       options do
         {
             artifacts: { reports: { sast: 'gl-sast-report.json' } }
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index a2c5030d18f..2790be8b70d 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -130,14 +130,6 @@ FactoryBot.define do
         end
       end
 
-      trait :with_sast_build do
-        status { :success }
-
-        after(:build) do |pipeline, evaluator|
-          pipeline.builds << build(:ci_build, :sast, pipeline: pipeline, project: pipeline.project)
-        end
-      end
-
       trait :with_exposed_artifacts do
         status { :success }