Read about our upcoming Code of Conduct on this issue

Unverified Commit 2eb9a20f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Enable CI for gitlab when .gitlab-ci.yml is pushed


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 33c085678862
...@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.1.0 (unreleased) v 8.1.0 (unreleased)
- Show CI status on all pages where commits list is rendered - Show CI status on all pages where commits list is rendered
- Automatically enable CI when push .gitlab-ci.yml file to repository
v 8.0.1 v 8.0.1
- Improve CI migration procedure and documentation - Improve CI migration procedure and documentation
......
...@@ -739,4 +739,23 @@ def create_wiki ...@@ -739,4 +739,23 @@ def create_wiki
def ci_commit(sha) def ci_commit(sha)
gitlab_ci_project.commits.find_by(sha: sha) if gitlab_ci? gitlab_ci_project.commits.find_by(sha: sha) if gitlab_ci?
end end
def enable_ci(user)
# Enable service
service = gitlab_ci_service || create_gitlab_ci_service
service.active = true
service.save
# Create Ci::Project
params = OpenStruct.new({
id: self.id,
name_with_namespace: self.name_with_namespace,
path_with_namespace: self.path_with_namespace,
web_url: self.web_url,
default_branch: self.default_branch,
ssh_url_to_repo: self.ssh_url_to_repo
})
Ci::CreateProjectService.new.execute(user, params)
end
end end
...@@ -72,7 +72,7 @@ def fork_registration(new_project, current_user) ...@@ -72,7 +72,7 @@ def fork_registration(new_project, current_user)
}) })
ci_project = Ci::Project.find_by!(gitlab_id: project.id) ci_project = Ci::Project.find_by!(gitlab_id: project.id)
Ci::CreateProjectService.new.execute( Ci::CreateProjectService.new.execute(
current_user, current_user,
params, params,
......
...@@ -55,6 +55,12 @@ def execute(project, user, oldrev, newrev, ref) ...@@ -55,6 +55,12 @@ def execute(project, user, oldrev, newrev, ref)
@push_data = build_push_data(oldrev, newrev, ref) @push_data = build_push_data(oldrev, newrev, ref)
# If CI was disabled but .gitlab-ci.yml file was pushed
# we enable CI automatically
if !project.gitlab_ci? && gitlab_ci_yaml?(newrev)
project.enable_ci(user)
end
EventCreateService.new.push(project, user, @push_data) EventCreateService.new.push(project, user, @push_data)
project.execute_hooks(@push_data.dup, :push_hooks) project.execute_hooks(@push_data.dup, :push_hooks)
project.execute_services(@push_data.dup, :push_hooks) project.execute_services(@push_data.dup, :push_hooks)
...@@ -143,4 +149,8 @@ def is_default_branch?(ref) ...@@ -143,4 +149,8 @@ def is_default_branch?(ref)
def commit_user(commit) def commit_user(commit)
commit.author || user commit.author || user
end end
def gitlab_ci_yaml?(sha)
@project.repository.blob_at(sha, '.gitlab-ci.yml')
end
end end
...@@ -411,4 +411,14 @@ ...@@ -411,4 +411,14 @@
it { expect(project.ci_commit(commit.sha)).to eq(commit) } it { expect(project.ci_commit(commit.sha)).to eq(commit) }
end end
describe :enable_ci do
let(:project) { create :project }
let(:user) { create :user }
before { project.enable_ci(user) }
it { expect(project.gitlab_ci?).to be_truthy }
it { expect(project.gitlab_ci_project).to be_a(Ci::Project) }
end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment