diff options
| -rw-r--r-- | app/workers/pages_worker.rb | 3 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 | ||||
| -rw-r--r-- | lib/backup/manager.rb | 2 | ||||
| -rw-r--r-- | spec/services/update_pages_service_spec.rb | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/app/workers/pages_worker.rb b/app/workers/pages_worker.rb index 9aa3030264b..c51ec81c9da 100644 --- a/app/workers/pages_worker.rb +++ b/app/workers/pages_worker.rb @@ -34,7 +34,8 @@ class PagesWorker # We manually extract the archive and limit the archive size with dd results = Open3.pipeline(%W(gunzip -c #{artifacts}), %W(dd bs=#{BLOCK_SIZE} count=#{blocks}), - %W(tar -x -C #{temp_path} public/)) + %W(tar -x -C #{temp_path} public/), + err: '/dev/null') return unless results.compact.all?(&:success?) # Check if we did extract public directory diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 022b0e80917..56bf4e6b1de 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -50,3 +50,4 @@ - [reactive_caching, 1] - [cronjob, 1] - [default, 1] + - [pages, 1] diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index cefbfdce3bb..f099c0651ac 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -1,6 +1,6 @@ module Backup class Manager - ARCHIVES_TO_BACKUP = %w[uploads builds artifacts lfs registry] + ARCHIVES_TO_BACKUP = %w[uploads builds artifacts pages lfs registry] FOLDERS_TO_BACKUP = %w[repositories db] FILE_NAME_SUFFIX = '_gitlab_backup.tar' diff --git a/spec/services/update_pages_service_spec.rb b/spec/services/update_pages_service_spec.rb index ed392cd94ee..cf1ca15da44 100644 --- a/spec/services/update_pages_service_spec.rb +++ b/spec/services/update_pages_service_spec.rb @@ -5,6 +5,10 @@ describe UpdatePagesService, services: true do let(:data) { Gitlab::BuildDataBuilder.build(build) } let(:service) { UpdatePagesService.new(data) } + before do + allow(Gitlab.config.pages).to receive(:enabled).and_return(true) + end + context 'execute asynchronously for pages job' do before { build.name = 'pages' } |