Merge branch 'sh-fix-pipeline-cache-worker-ee' into 'master'

Fix broken master due to pipeline cache refactoring

Closes #11172

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

app/services/ci/expire_pipeline_cache_service.rb

@@ -60,3 +60,5 @@ module Ci
     end
   end
 end
+
+Ci::ExpirePipelineCacheService.prepend(EE::Ci::ExpirePipelineCacheService)

app/workers/expire_pipeline_cache_worker.rb

@@ -15,5 +15,3 @@ class ExpirePipelineCacheWorker
   end
   # rubocop: enable CodeReuse/ActiveRecord
 end
-
-ExpirePipelineCacheWorker.prepend(EE::ExpirePipelineCacheWorker)

ee/app/services/ee/ci/expire_pipeline_cache_service.rb

+# frozen_string_literal: true
+
+module EE
+  module Ci
+    module ExpirePipelineCacheService
+      extend ::Gitlab::Utils::Override
+
+      override :update_etag_cache
+      def update_etag_cache(pipeline, store)
+        super
+
+        triggered_by = pipeline.triggered_by_pipeline
+        store.touch(project_pipeline_path(triggered_by.project, triggered_by)) if triggered_by
+
+        pipeline.triggered_pipelines.each do |triggered|
+          store.touch(project_pipeline_path(triggered.project, triggered))
+        end
+      end
+    end
+  end
+end

ee/app/workers/ee/expire_pipeline_cache_worker.rb

-# frozen_string_literal: true
-
-module EE
-  module ExpirePipelineCacheWorker
-    extend ActiveSupport::Concern
-    extend ::Gitlab::Utils::Override
-
-    override :update_etag_cache
-    def update_etag_cache(pipeline, store)
-      super
-
-      triggered_by = pipeline.triggered_by_pipeline
-      store.touch(project_pipeline_path(triggered_by.project, triggered_by)) if triggered_by
-
-      pipeline.triggered_pipelines.each do |triggered|
-        store.touch(project_pipeline_path(triggered.project, triggered))
-      end
-    end
-  end
-end

ee/spec/workers/expire_pipeline_cache_worker_spec.rb → ee/spec/services/ci/expire_pipeline_cache_service_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ExpirePipelineCacheWorker do
+describe Ci::ExpirePipelineCacheService do
   let(:pipeline) { create(:ci_empty_pipeline) }
 
   subject { described_class.new }
@@ -17,7 +17,7 @@ describe ExpirePipelineCacheWorker do
         allow_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch)
         expect_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch).with(dependent_pipeline_path)
 
-        subject.perform(pipeline.id)
+        subject.execute(pipeline)
       end
     end
 
@@ -31,7 +31,7 @@ describe ExpirePipelineCacheWorker do
         allow_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch)
         expect_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch).with(dependent_pipeline_path)
 
-        subject.perform(pipeline.id)
+        subject.execute(pipeline)
       end
     end
   end