Merge branch 'ce-to-ee-2018-11-22' into 'master'

CE upstream - 2018-11-22 19:21 UTC

See merge request gitlab-org/gitlab-ee!8559

app/models/clusters/applications/runner.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Runner < ActiveRecord::Base
-      VERSION = '0.1.35'.freeze
+      VERSION = '0.1.38'.freeze
 
       self.table_name = 'clusters_applications_runners'
 

changelogs/unreleased/dm-batch-loader-sidekiq.yml

+---
+title: Clear BatchLoader context between Sidekiq jobs
+merge_request: 23308
+author:
+type: fixed

changelogs/unreleased/update-gitlab-runner-helm-chart-version.yml

+---
+title: Update used version of Runner Helm Chart to 0.1.38
+merge_request: 23304
+author:
+type: other

config/initializers/sidekiq.rb

@@ -20,6 +20,7 @@ Sidekiq.configure_server do |config|
     chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] && !enable_json_logs
     chain.add Gitlab::SidekiqMiddleware::Shutdown
     chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0'
+    chain.add Gitlab::SidekiqMiddleware::BatchLoader
     chain.add Gitlab::SidekiqStatus::ServerMiddleware
   end
 

lib/gitlab/sidekiq_middleware/batch_loader.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module SidekiqMiddleware
+    class BatchLoader
+      def call(worker, job, queue)
+        yield
+      ensure
+        ::BatchLoader::Executor.clear_current
+      end
+    end
+  end
+end

spec/models/clusters/applications/runner_spec.rb

@@ -18,7 +18,7 @@ describe Clusters::Applications::Runner do
       let(:application) { create(:clusters_applications_runner, :scheduled, version: '0.1.30') }
 
       it 'updates the application version' do
-        expect(application.reload.version).to eq('0.1.35')
+        expect(application.reload.version).to eq('0.1.38')
       end
     end
   end
@@ -46,7 +46,7 @@ describe Clusters::Applications::Runner do
     it 'should be initialized with 4 arguments' do
       expect(subject.name).to eq('runner')
       expect(subject.chart).to eq('runner/gitlab-runner')
-      expect(subject.version).to eq('0.1.35')
+      expect(subject.version).to eq('0.1.38')
       expect(subject).not_to be_rbac
       expect(subject.repository).to eq('https://charts.gitlab.io')
       expect(subject.files).to eq(gitlab_runner.files)
@@ -64,7 +64,7 @@ describe Clusters::Applications::Runner do
       let(:gitlab_runner) { create(:clusters_applications_runner, :errored, runner: ci_runner, version: '0.1.13') }
 
       it 'should be initialized with the locked version' do
-        expect(subject.version).to eq('0.1.35')
+        expect(subject.version).to eq('0.1.38')
       end
     end
   end