Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 1 deletions

diff --git a/db/migrate/20221121100431_add_partition_id_to_ci_resources.rb b/db/migrate/20221121100431_add_partition_id_to_ci_resources.rb
new file mode 100644
index 00000000000..5b783057b3a
--- /dev/null
+++ b/db/migrate/20221121100431_add_partition_id_to_ci_resources.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddPartitionIdToCiResources < Gitlab::Database::Migration[2.0]
+  enable_lock_retries!
+
+  def change
+    add_column(:ci_resources, :partition_id, :bigint, default: 100, null: false)
+  end
+end
diff --git a/db/schema_migrations/20221121100431 b/db/schema_migrations/20221121100431
new file mode 100644
index 00000000000..c89e74a5c09
--- /dev/null
+++ b/db/schema_migrations/20221121100431
@@ -0,0 +1 @@
+e4d54fe2976b8f38053126a7e25fc26d8c84aca36f219435a7cdf57948d36b94
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 26d55c94b8e..5233f7e5a21 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -13344,7 +13344,8 @@ CREATE TABLE ci_resources (
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
     resource_group_id bigint NOT NULL,
-    build_id bigint
+    build_id bigint,
+    partition_id bigint DEFAULT 100 NOT NULL
 );
 
 CREATE SEQUENCE ci_resources_id_seq