From e69d40a6aeea5c6f9685a51ed73ab578836bb6c0 Mon Sep 17 00:00:00 2001 From: pkanellidis Date: Wed, 17 Jul 2024 11:35:53 +0300 Subject: [PATCH 1/2] Add jacoco file limit Changelog: other --- ...240717083115_add_jacoco_coverage_report_plan_limit.rb | 9 +++++++++ db/schema_migrations/20240717083115 | 1 + db/structure.sql | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20240717083115_add_jacoco_coverage_report_plan_limit.rb create mode 100644 db/schema_migrations/20240717083115 diff --git a/db/migrate/20240717083115_add_jacoco_coverage_report_plan_limit.rb b/db/migrate/20240717083115_add_jacoco_coverage_report_plan_limit.rb new file mode 100644 index 00000000000000..430b04536309ba --- /dev/null +++ b/db/migrate/20240717083115_add_jacoco_coverage_report_plan_limit.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddJacocoCoverageReportPlanLimit < Gitlab::Database::Migration[2.2] + milestone '17.3' + + def change + add_column :plan_limits, :ci_max_artifact_size_jacoco, :bigint, default: 0, null: false + end +end diff --git a/db/schema_migrations/20240717083115 b/db/schema_migrations/20240717083115 new file mode 100644 index 00000000000000..57f22b58f21205 --- /dev/null +++ b/db/schema_migrations/20240717083115 @@ -0,0 +1 @@ +c235d9f474168935f18e5c072315b3b8d2ea9f859eadce47a66a68be9daaa397 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index e936757c4d0051..880819e52e6ed3 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -15001,7 +15001,8 @@ CREATE TABLE plan_limits ( file_size_limit_mb double precision DEFAULT 100.0 NOT NULL, audit_events_amazon_s3_configurations integer DEFAULT 5 NOT NULL, ci_max_artifact_size_repository_xray bigint DEFAULT 1073741824 NOT NULL, - active_versioned_pages_deployments_limit_by_namespace integer DEFAULT 0 NOT NULL + active_versioned_pages_deployments_limit_by_namespace integer DEFAULT 0 NOT NULL, + ci_max_artifact_size_jacoco bigint DEFAULT 0 NOT NULL ); CREATE SEQUENCE plan_limits_id_seq -- GitLab From 331f3ee27aa9736afefe34dfc327a98ef0ba69db Mon Sep 17 00:00:00 2001 From: pkanellidis Date: Mon, 29 Jul 2024 12:40:40 +0300 Subject: [PATCH 2/2] Update timestamp & fix spec Changelog: other --- ...b => 20240724083115_add_jacoco_coverage_report_plan_limit.rb} | 0 db/schema_migrations/20240717083115 | 1 - db/schema_migrations/20240724083115 | 1 + spec/models/plan_limits_spec.rb | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename db/migrate/{20240717083115_add_jacoco_coverage_report_plan_limit.rb => 20240724083115_add_jacoco_coverage_report_plan_limit.rb} (100%) delete mode 100644 db/schema_migrations/20240717083115 create mode 100644 db/schema_migrations/20240724083115 diff --git a/db/migrate/20240717083115_add_jacoco_coverage_report_plan_limit.rb b/db/migrate/20240724083115_add_jacoco_coverage_report_plan_limit.rb similarity index 100% rename from db/migrate/20240717083115_add_jacoco_coverage_report_plan_limit.rb rename to db/migrate/20240724083115_add_jacoco_coverage_report_plan_limit.rb diff --git a/db/schema_migrations/20240717083115 b/db/schema_migrations/20240717083115 deleted file mode 100644 index 57f22b58f21205..00000000000000 --- a/db/schema_migrations/20240717083115 +++ /dev/null @@ -1 +0,0 @@ -c235d9f474168935f18e5c072315b3b8d2ea9f859eadce47a66a68be9daaa397 \ No newline at end of file diff --git a/db/schema_migrations/20240724083115 b/db/schema_migrations/20240724083115 new file mode 100644 index 00000000000000..c6b689c11dd4f3 --- /dev/null +++ b/db/schema_migrations/20240724083115 @@ -0,0 +1 @@ +00ab2cce899b12833dd3350602e4befe04e57ca7ed14fb3bf3308a066409d36e \ No newline at end of file diff --git a/spec/models/plan_limits_spec.rb b/spec/models/plan_limits_spec.rb index dbb10a36c561c3..eef3f7c66e12b4 100644 --- a/spec/models/plan_limits_spec.rb +++ b/spec/models/plan_limits_spec.rb @@ -249,6 +249,7 @@ ci_max_artifact_size_coverage_fuzzing ci_max_artifact_size_api_fuzzing ci_max_artifact_size_annotations + ci_max_artifact_size_jacoco ] end -- GitLab