Add latest changes from gitlab-org/gitlab@master

7 files changed, 49 insertions, 39 deletions

diff --git a/db/docs/ci_build_needs.yml b/db/docs/ci_build_needs.yml
index 976d834c884..f9367124ed2 100644
--- a/db/docs/ci_build_needs.yml
+++ b/db/docs/ci_build_needs.yml
@@ -4,6 +4,6 @@ classes:
 - Ci::BuildNeed
 feature_categories:
 - pipeline_authoring
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/e7ee84aad4237eaa16f2aba75b4d2c7860625c9d
+description: Dependencies for a specific CI/CD job.
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31328
 milestone: '12.2'
diff --git a/db/docs/geo_job_artifact_deleted_events.yml b/db/docs/geo_job_artifact_deleted_events.yml
deleted file mode 100644
index d58b0b83924..00000000000
--- a/db/docs/geo_job_artifact_deleted_events.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-table_name: geo_job_artifact_deleted_events
-classes:
-- Geo::JobArtifactDeletedEvent
-feature_categories:
-- geo_replication
-description: TODO
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3935
-milestone: '10.4'
diff --git a/db/post_migrate/20220415124802_remove_job_artifact_deprecated_geo_fields.rb b/db/post_migrate/20220415124802_remove_job_artifact_deprecated_geo_fields.rb
new file mode 100644
index 00000000000..65432ba3ce1
--- /dev/null
+++ b/db/post_migrate/20220415124802_remove_job_artifact_deprecated_geo_fields.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class RemoveJobArtifactDeprecatedGeoFields < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      remove_column :geo_event_log, :job_artifact_deleted_event_id, :bigint
+    end
+  end
+
+  def down
+    with_lock_retries do
+      unless column_exists?(:geo_event_log, :job_artifact_deleted_event_id)
+        add_column(:geo_event_log, :job_artifact_deleted_event_id, :bigint)
+      end
+    end
+
+    add_concurrent_foreign_key :geo_event_log, :geo_job_artifact_deleted_events,
+                               column: :job_artifact_deleted_event_id,
+                               name: 'fk_176d3fbb5d',
+                               on_delete: :cascade
+
+    add_concurrent_index :geo_event_log,
+                         :job_artifact_deleted_event_id,
+                         name: 'index_geo_event_log_on_job_artifact_deleted_event_id',
+                         where: "(job_artifact_deleted_event_id IS NOT NULL)"
+  end
+end
diff --git a/db/post_migrate/20220415124804_remove_job_artifact_deleted_event_table.rb b/db/post_migrate/20220415124804_remove_job_artifact_deleted_event_table.rb
new file mode 100644
index 00000000000..05b716f26ab
--- /dev/null
+++ b/db/post_migrate/20220415124804_remove_job_artifact_deleted_event_table.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RemoveJobArtifactDeletedEventTable < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    drop_table :geo_job_artifact_deleted_events
+  end
+
+  def down
+    create_table :geo_job_artifact_deleted_events, id: :bigserial do |t|
+      t.bigint :job_artifact_id, null: false, index: true
+      t.string :file_path, null: false
+    end
+  end
+end
diff --git a/db/schema_migrations/20220415124802 b/db/schema_migrations/20220415124802
new file mode 100644
index 00000000000..3f5c99b675b
--- /dev/null
+++ b/db/schema_migrations/20220415124802
@@ -0,0 +1 @@
+aaf55d3f4a82789695ce1107d045a6230e111d5058733f72ccf4a1e5563a2636
\ No newline at end of file
diff --git a/db/schema_migrations/20220415124804 b/db/schema_migrations/20220415124804
new file mode 100644
index 00000000000..1c325f0fdbc
--- /dev/null
+++ b/db/schema_migrations/20220415124804
@@ -0,0 +1 @@
+728ce5b9d0986fa55a43841b2a5961f9716b3e2933d1e77e3ac00e30244c6f8e
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 2d052a0a4d0..fa9d9e8f778 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -15181,7 +15181,6 @@ CREATE TABLE geo_event_log (
     hashed_storage_migrated_event_id bigint,
     lfs_object_deleted_event_id bigint,
     hashed_storage_attachments_event_id bigint,
-    job_artifact_deleted_event_id bigint,
     reset_checksum_event_id bigint,
     cache_invalidation_event_id bigint,
     container_repository_updated_event_id bigint,
@@ -15253,21 +15252,6 @@ CREATE SEQUENCE geo_hashed_storage_migrated_events_id_seq
 
 ALTER SEQUENCE geo_hashed_storage_migrated_events_id_seq OWNED BY geo_hashed_storage_migrated_events.id;
 
-CREATE TABLE geo_job_artifact_deleted_events (
-    id bigint NOT NULL,
-    file_path character varying NOT NULL,
-    job_artifact_id bigint NOT NULL
-);
-
-CREATE SEQUENCE geo_job_artifact_deleted_events_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE geo_job_artifact_deleted_events_id_seq OWNED BY geo_job_artifact_deleted_events.id;
-
 CREATE TABLE geo_lfs_object_deleted_events (
     id bigint NOT NULL,
     lfs_object_id integer NOT NULL,
@@ -22742,8 +22726,6 @@ ALTER TABLE ONLY geo_hashed_storage_attachments_events ALTER COLUMN id SET DEFAU
 
 ALTER TABLE ONLY geo_hashed_storage_migrated_events ALTER COLUMN id SET DEFAULT nextval('geo_hashed_storage_migrated_events_id_seq'::regclass);
 
-ALTER TABLE ONLY geo_job_artifact_deleted_events ALTER COLUMN id SET DEFAULT nextval('geo_job_artifact_deleted_events_id_seq'::regclass);
-
 ALTER TABLE ONLY geo_lfs_object_deleted_events ALTER COLUMN id SET DEFAULT nextval('geo_lfs_object_deleted_events_id_seq'::regclass);
 
 ALTER TABLE ONLY geo_node_namespace_links ALTER COLUMN id SET DEFAULT nextval('geo_node_namespace_links_id_seq'::regclass);
@@ -24583,9 +24565,6 @@ ALTER TABLE ONLY geo_hashed_storage_attachments_events
 ALTER TABLE ONLY geo_hashed_storage_migrated_events
     ADD CONSTRAINT geo_hashed_storage_migrated_events_pkey PRIMARY KEY (id);
 
-ALTER TABLE ONLY geo_job_artifact_deleted_events
-    ADD CONSTRAINT geo_job_artifact_deleted_events_pkey PRIMARY KEY (id);
-
 ALTER TABLE ONLY geo_lfs_object_deleted_events
     ADD CONSTRAINT geo_lfs_object_deleted_events_pkey PRIMARY KEY (id);
 
@@ -27792,8 +27771,6 @@ CREATE INDEX index_geo_event_log_on_hashed_storage_attachments_event_id ON geo_e
 
 CREATE INDEX index_geo_event_log_on_hashed_storage_migrated_event_id ON geo_event_log USING btree (hashed_storage_migrated_event_id) WHERE (hashed_storage_migrated_event_id IS NOT NULL);
 
-CREATE INDEX index_geo_event_log_on_job_artifact_deleted_event_id ON geo_event_log USING btree (job_artifact_deleted_event_id) WHERE (job_artifact_deleted_event_id IS NOT NULL);
-
 CREATE INDEX index_geo_event_log_on_lfs_object_deleted_event_id ON geo_event_log USING btree (lfs_object_deleted_event_id) WHERE (lfs_object_deleted_event_id IS NOT NULL);
 
 CREATE INDEX index_geo_event_log_on_repositories_changed_event_id ON geo_event_log USING btree (repositories_changed_event_id) WHERE (repositories_changed_event_id IS NOT NULL);
@@ -27812,8 +27789,6 @@ CREATE INDEX index_geo_hashed_storage_attachments_events_on_project_id ON geo_ha
 
 CREATE INDEX index_geo_hashed_storage_migrated_events_on_project_id ON geo_hashed_storage_migrated_events USING btree (project_id);
 
-CREATE INDEX index_geo_job_artifact_deleted_events_on_job_artifact_id ON geo_job_artifact_deleted_events USING btree (job_artifact_id);
-
 CREATE INDEX index_geo_lfs_object_deleted_events_on_lfs_object_id ON geo_lfs_object_deleted_events USING btree (lfs_object_id);
 
 CREATE INDEX index_geo_node_namespace_links_on_geo_node_id ON geo_node_namespace_links USING btree (geo_node_id);
@@ -31214,9 +31189,6 @@ ALTER TABLE ONLY protected_branch_push_access_levels
 ALTER TABLE ONLY internal_ids
     ADD CONSTRAINT fk_162941d509 FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
-ALTER TABLE ONLY geo_event_log
-    ADD CONSTRAINT fk_176d3fbb5d FOREIGN KEY (job_artifact_deleted_event_id) REFERENCES geo_job_artifact_deleted_events(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY incident_management_timeline_events
     ADD CONSTRAINT fk_17a5fafbd4 FOREIGN KEY (issue_id) REFERENCES issues(id) ON DELETE CASCADE;