Merge remote-tracking branch 'upstream/master'

1 files changed, 27 insertions, 0 deletions

diff --git a/app/workers/expire_job_cache_worker.rb b/app/workers/expire_job_cache_worker.rb
new file mode 100644
index 00000000000..e383202260d
--- /dev/null
+++ b/app/workers/expire_job_cache_worker.rb
@@ -0,0 +1,27 @@
+class ExpireJobCacheWorker
+  include Sidekiq::Worker
+  include BuildQueue
+
+  def perform(job_id)
+    job = CommitStatus.joins(:pipeline, :project).find_by(id: job_id)
+    return unless job
+
+    pipeline = job.pipeline
+    project = job.project
+
+    Gitlab::EtagCaching::Store.new.tap do |store|
+      store.touch(project_pipeline_path(project, pipeline))
+      store.touch(project_job_path(project, job))
+    end
+  end
+
+  private
+
+  def project_pipeline_path(project, pipeline)
+    Gitlab::Routing.url_helpers.project_pipeline_path(project, pipeline, format: :json)
+  end
+
+  def project_job_path(project, job)
+    Gitlab::Routing.url_helpers.project_build_path(project, job.id, format: :json)
+  end
+end