diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-09 06:08:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-09 06:08:43 +0000 |
| commit | 3a8425c52044f6e2a52f0654b6f94577f9eda291 (patch) | |
| tree | a61bc2870e2c5bd7c8b669c729feff5e3fdcbb5a /app/workers/ci | |
| parent | 37e1f8c80ec35e6833b0da7ac2f604ca67c91a17 (diff) | |
| download | gitlab-ce-3a8425c52044f6e2a52f0654b6f94577f9eda291.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/ci')
| -rw-r--r-- | app/workers/ci/archive_trace_worker.rb | 8 | ||||
| -rw-r--r-- | app/workers/ci/build_finished_worker.rb | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/workers/ci/archive_trace_worker.rb b/app/workers/ci/archive_trace_worker.rb index 47d77c15b4a..edbaf0536a2 100644 --- a/app/workers/ci/archive_trace_worker.rb +++ b/app/workers/ci/archive_trace_worker.rb @@ -4,17 +4,13 @@ module Ci class ArchiveTraceWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker - data_consistency :sticky, feature_flag: :sticky_ci_archive_trace_worker + data_consistency :sticky sidekiq_options retry: 3 include PipelineBackgroundQueue def perform(job_id) - archivable_jobs = Ci::Build.without_archived_trace - - if Feature.enabled?(:sticky_ci_archive_trace_worker) - archivable_jobs = archivable_jobs.eager_load_for_archiving_trace - end + archivable_jobs = Ci::Build.without_archived_trace.eager_load_for_archiving_trace archivable_jobs.find_by_id(job_id).try do |job| Ci::ArchiveTraceService.new.execute(job, worker_name: self.class.name) diff --git a/app/workers/ci/build_finished_worker.rb b/app/workers/ci/build_finished_worker.rb index 5ceaa87d2f5..25c7637a79f 100644 --- a/app/workers/ci/build_finished_worker.rb +++ b/app/workers/ci/build_finished_worker.rb @@ -40,6 +40,7 @@ module Ci BuildHooksWorker.perform_async(build) ChatNotificationWorker.perform_async(build.id) if build.pipeline.chat? build.track_deployment_usage + build.track_verify_usage if build.failed? && !build.auto_retry_expected? ::Ci::MergeRequests::AddTodoWhenBuildFailsWorker.perform_async(build.id) |