diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index 832d7deb57d0a515150c74611bc703b60d30af40..028e1f7711984c200f2f2a3663d6d9838c13b8ce 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -34,6 +34,11 @@ class Projects::ArtifactsController < Projects::ApplicationController
end
end
+ def keep
+ build.keep_artifacts!
+ redirect_to namespace_project_build_path(project.namespace, project, build)
+ end
+
private
def build
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 74084b650cfb8d3063575b7648b0beca8388f183..5eb9fe5f1f56c36fc7da3ef907fc9c52d5094700 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -12,7 +12,7 @@ module Ci
scope :unstarted, ->() { where(runner_id: nil) }
scope :ignore_failures, ->() { where(allow_failure: false) }
scope :with_artifacts, ->() { where.not(artifacts_file: nil) }
- scope :with_artifacts_expired, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
+ scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
mount_uploader :artifacts_file, ArtifactUploader
mount_uploader :artifacts_metadata, ArtifactUploader
@@ -352,10 +352,10 @@ module Ci
end
def artifacts_expired?
- self.artifacts_expire_at < Time.now && !artifacts?
+ !artifacts? && artifacts_expire_at && artifacts_expire_at < Time.now
end
- def keep_artifacts
+ def keep_artifacts!
self.update(artifacts_expire_at: nil)
end
@@ -366,7 +366,7 @@ module Ci
end
def update_erased!(user = nil)
- self.update(erased_by: user, erased_at: Time.now)
+ self.update(erased_by: user, erased_at: Time.now, artifacts_expire_at: nil)
end
def yaml_variables
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index d1a0da29ef76298acab08e5b20a5edad37e400da..e1fdd7019ff66981bb731e2d6214ee674cc4b21d 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -44,15 +44,16 @@
%p.build-detail-row
%span.build-light-text Erased:
#{time_ago_with_tooltip(@build.erased_at)}
- - elsif @build.artifacts_expired?
- %p.build-detail-row.artifacts-expired.alert.alert-warning
- The artifacts were removed #{time_ago_with_tooltip(@build.artifacts_expire_at)}
- - elsif @build.artifacts_expire_at
- %p.build-detail-row.artifacts-expired.alert.alert-info
- The artifacts will be removed at #{time_ago_with_tooltip(@build.artifacts_expire_at)}
- .pull-right
- = link_to keep_artifacts_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-primary' do
- Keep
+ - else
+ - if @build.artifacts_expired?
+ .artifacts-expired.alert.alert-warning
+ The artifacts were removed #{time_ago_with_tooltip(@build.artifacts_expire_at)}
+ - elsif @build.artifacts_expire_at
+ .artifacts-expired.alert.alert-warning
+ The artifacts will be removed in #{duration_in_words(@build.artifacts_expire_at, Time.now)}
+ .pull-right
+ = link_to keep_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-xs btn-primary', method: :post do
+ Keep
%p.build-detail-row
%span.build-light-text Runner:
- if @build.runner && current_user && current_user.admin
diff --git a/app/workers/expire_build_artifacts.rb b/app/workers/expire_build_artifacts_worker.rb
similarity index 66%
rename from app/workers/expire_build_artifacts.rb
rename to app/workers/expire_build_artifacts_worker.rb
index 3d809d8ab6b0dbff14cfb9322c0ff590d57d80ef..17b3b5f227f122086d733703f65b93faa2af3e80 100644
--- a/app/workers/expire_build_artifacts.rb
+++ b/app/workers/expire_build_artifacts_worker.rb
@@ -4,8 +4,9 @@ class ExpireBuildArtifacts
def perform
Rails.logger.info 'Cleaning old build artifacts'
- builds = Ci::Build.with_artifacts_expired
+ builds = Ci::Build.with_expired_artifacts
builds.find_each(batch_size: 50).each do |build|
+ Rails.logger.debug "Removing artifacts build #{build.id}..."
build.erase_artifacts!
end
end
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 7b37e92ed46ff4f485dbce6b19ac378f7ffe8f96..75e1a3c1093343ffe062df4efa988c8f0603d86f 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -164,8 +164,8 @@ production: &base
# Flag stuck CI builds as failed
stuck_ci_builds_worker:
cron: "0 0 * * *"
- # Remove old artifacts
- expire_build_artifacts:
+ # Remove expired build artifacts
+ expire_build_artifacts_worker:
cron: "50 * * * *"
# Periodically run 'git fsck' on all repositories. If started more than
# once per hour you will have concurrent 'git fsck' jobs.
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index b412d1e09817360cd210980986c52a598a0ec2dd..a7320c3a0a7b7acf2a7f6e6d291c3730145d0692 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -279,9 +279,9 @@ Settings['cron_jobs'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *'
Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker'
-Settings.cron_jobs['expire_build_artifacts'] ||= Settingslogic.new({})
-Settings.cron_jobs['expire_build_artifacts']['cron'] ||= '0 0 * * *'
-Settings.cron_jobs['expire_build_artifacts']['job_class'] = 'ExpireBuildArtifacts'
+Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '0 0 * * *'
+Settings.cron_jobs['expire_build_artifacts_worker']['job_class'] = 'ExpireBuildArtifactsWorker'
Settings.cron_jobs['repository_check_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['repository_check_worker']['cron'] ||= '20 * * * *'
Settings.cron_jobs['repository_check_worker']['job_class'] = 'RepositoryCheck::BatchWorker'
diff --git a/config/routes.rb b/config/routes.rb
index 3d092d98c8ec5e9729b9f9cdbb7e3e99d55f3d14..59724b737f676a01bae64b09c82ba00ce99d61e8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -714,7 +714,6 @@ Rails.application.routes.draw do
post :cancel
post :retry
post :erase
- post :keep_artifacts
get :trace
get :raw
end
@@ -723,6 +722,7 @@ Rails.application.routes.draw do
get :download
get :browse, path: 'browse(/*path)', format: false
get :file, path: 'file/*path', format: false
+ post :keep
end
end