From 68df0b7bf2e28d75852940b329c5ea9e94f740b6 Mon Sep 17 00:00:00 2001
From: gdk <gdk@example.com>
Date: Thu, 17 Jul 2025 23:32:00 +0000
Subject: [PATCH] Finalize BBM BackfillOrganizationIdOnCiRunnerMachines

This migration was finished at `2025-06-18 07:45:03 UTC`, you can confirm
the status using our
[batched background migration chatops commands](https://docs.gitlab.com/ee/development/database/batched_background_migrations.html#monitor-the-progress-and-status-of-a-batched-background-migration).
  To confirm it is finished you can run:

```
/chatops run batched_background_migrations status 2000440 --database ci
```

The last time this background migration was triggered was in
[db/post_migrate/20250602183870_queue_backfill_organization_id_on_ci_runner_machines.rb](https://gitlab.com/gitlab-org/gitlab/-/blob/master/db/post_migrate/20250602183870_queue_backfill_organization_id_on_ci_runner_machines.rb)

You can read more about the process for finalizing batched background migrations in
https://docs.gitlab.com/ee/development/database/batched_background_migrations.html .

As part of our process we want to ensure all batched background migrations
have had at least one
[required stop](https://docs.gitlab.com/ee/development/database/required_stops.html)
to process the migration. Therefore we can finalize any batched background migration that was added before the
last required stop.

This change was generated by
[gitlab-housekeeper](https://gitlab.com/gitlab-org/gitlab/-/tree/master/gems/gitlab-housekeeper)
in [CI](https://ops.gitlab.net/gitlab-com/database-team/gitlab-com-database-testing/-/jobs/19363183) using the `Keeps::OverdueFinalizeBackgroundMigration` keep.

To provide feedback on your experience with `gitlab-housekeeper` please create an issue with the
label ~"GitLab Housekeeper" and consider pinging the author of this keep.

Changelog: other
---
 ..._organization_id_on_ci_runner_machines.yml |  8 ++++---
 ...l_organization_id_on_ci_runner_machines.rb | 21 +++++++++++++++++++
 db/schema_migrations/20250717233145           |  1 +
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 db/post_migrate/20250717233145_finalize_hk_backfill_organization_id_on_ci_runner_machines.rb
 create mode 100644 db/schema_migrations/20250717233145

diff --git a/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_machines.yml b/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_machines.yml
index 646e3a484907d3..823a1fefdd5094 100644
--- a/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_machines.yml
+++ b/db/docs/batched_background_migrations/backfill_organization_id_on_ci_runner_machines.yml
@@ -1,9 +1,11 @@
 ---
 migration_job_name: BackfillOrganizationIdOnCiRunnerMachines
-description: >
-  Backfill organization_id column for machines associated with non-instance type runners with default organization id
+description: 'Backfill organization_id column for machines associated with non-instance
+  type runners with default organization id
+
+  '
 feature_category: fleet_visibility
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/193195
 milestone: '18.2'
 queued_migration_version: 20250602183870
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250717233145'
diff --git a/db/post_migrate/20250717233145_finalize_hk_backfill_organization_id_on_ci_runner_machines.rb b/db/post_migrate/20250717233145_finalize_hk_backfill_organization_id_on_ci_runner_machines.rb
new file mode 100644
index 00000000000000..88744d4b3333f8
--- /dev/null
+++ b/db/post_migrate/20250717233145_finalize_hk_backfill_organization_id_on_ci_runner_machines.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillOrganizationIdOnCiRunnerMachines < Gitlab::Database::Migration[2.3]
+  milestone '18.3'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_ci
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillOrganizationIdOnCiRunnerMachines',
+      table_name: :ci_runner_machines,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20250717233145 b/db/schema_migrations/20250717233145
new file mode 100644
index 00000000000000..6730f82e79372b
--- /dev/null
+++ b/db/schema_migrations/20250717233145
@@ -0,0 +1 @@
+00df514bd31f7c689f3643e566fcfb2a20b7fa7b4ae684c88060c9ea219807db
\ No newline at end of file
-- 
GitLab