summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-03-07 13:53:26 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-03-07 13:53:26 +0000
commitfb4a486605e10692b5577f0700fbce38bebcc311 (patch)
tree975d06a93f4904ae55f4ebc8350b2cb70b7b2b1f /app
parent7a774d1a59d7b24b8247e4d67a453388a41c648a (diff)
parent32b09b8847955052765895063297181835c45b8c (diff)
downloadgitlab-ce-fb4a486605e10692b5577f0700fbce38bebcc311.tar.gz
Merge branch 'feature/runner-jobs-v4-api' into 'master'
Feature/runner jobs v4 api Closes #28513 See merge request !9273
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/build.rb21
-rw-r--r--app/services/ci/register_job_service.rb (renamed from app/services/ci/register_build_service.rb)2
2 files changed, 22 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index d69643967a1..77fa19cfe21 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -517,6 +517,27 @@ module Ci
]
end
+ def steps
+ [Gitlab::Ci::Build::Step.from_commands(self),
+ Gitlab::Ci::Build::Step.from_after_script(self)].compact
+ end
+
+ def image
+ Gitlab::Ci::Build::Image.from_image(self)
+ end
+
+ def services
+ Gitlab::Ci::Build::Image.from_services(self)
+ end
+
+ def artifacts
+ [options[:artifacts]]
+ end
+
+ def cache
+ [options[:cache]]
+ end
+
def credentials
Gitlab::Ci::Build::Credentials::Factory.new(self).create!
end
diff --git a/app/services/ci/register_build_service.rb b/app/services/ci/register_job_service.rb
index 5b52a0425de..0ab9042bf24 100644
--- a/app/services/ci/register_build_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -1,7 +1,7 @@
module Ci
# This class responsible for assigning
# proper pending build to runner on runner API request
- class RegisterBuildService
+ class RegisterJobService
include Gitlab::CurrentSettings
attr_reader :runner