Add some fixes and refactoring after review

1 files changed, 4 insertions, 10 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 0c0bbb9d41d..5ef089c87c5 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -510,23 +510,17 @@ module Ci
 
     def steps
       [
-          Gitlab::Ci::Build::Response::Step.from_commands(self),
-          Gitlab::Ci::Build::Response::Step.from_after_script(self)
+          Gitlab::Ci::Build::Step.from_commands(self),
+          Gitlab::Ci::Build::Step.from_after_script(self)
       ].compact
     end
 
     def image
-      image = Gitlab::Ci::Build::Response::Image.new(options[:image])
-      return unless image.valid?
-      image
+      Gitlab::Ci::Build::Image.from_image(self)
     end
 
     def services
-      services = options[:services].map do |service|
-        Gitlab::Ci::Build::Response::Image.new(service)
-      end
-
-      services.select(&:valid?).compact
+      Gitlab::Ci::Build::Image.from_services(self)
     end
 
     def artifacts