From b47eaa1762c727694b83ce9c525e4b542ba4c278 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 19 Nov 2025 14:52:17 -0500 Subject: [PATCH 1/6] Enable merge queue --- repository.datadog.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/repository.datadog.yaml b/repository.datadog.yaml index ded5018823b..6e51fa13533 100644 --- a/repository.datadog.yaml +++ b/repository.datadog.yaml @@ -1,4 +1,16 @@ --- schema-version: v1 -kind: mergequeue -enable: false +kind: mergequeue # https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/3121612126/MergeQueue +enable: true +merge_method: squash +branches: + master: + allow_skip_checks: true + require_reason_for_skip_checks: true +--- +schema-version: v1 +kind: mergegate # https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/4948100574/MergeGate +rules: + - require: labels + - require: commit-signatures + - require: reviewers-approval From bb0519f2ffb2d472a51a443b8362e6a88b6958f5 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 23 Jan 2026 12:56:21 -0500 Subject: [PATCH 2/6] Do not require all required approvals --- repository.datadog.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/repository.datadog.yaml b/repository.datadog.yaml index 6e51fa13533..3c7ac1c581a 100644 --- a/repository.datadog.yaml +++ b/repository.datadog.yaml @@ -13,4 +13,3 @@ kind: mergegate # https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/4948100 rules: - require: labels - require: commit-signatures - - require: reviewers-approval From af20cfddccb65f6d24546df42bad8643d4f40143 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 26 Jan 2026 09:40:06 -0500 Subject: [PATCH 3/6] Allow merge queue labels --- .github/workflows/check-pull-request-labels.yaml | 1 + repository.datadog.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-pull-request-labels.yaml b/.github/workflows/check-pull-request-labels.yaml index 16bdfe0a521..10f4175e31e 100644 --- a/.github/workflows/check-pull-request-labels.yaml +++ b/.github/workflows/check-pull-request-labels.yaml @@ -30,6 +30,7 @@ jobs: 'comp:', 'inst:', 'tag:', + 'mergequeue-status:', 'performance:', // To refactor to 'ci: ' in the future 'run-tests:' // Unused since GitLab migration ] diff --git a/repository.datadog.yaml b/repository.datadog.yaml index 3c7ac1c581a..d6754ea172d 100644 --- a/repository.datadog.yaml +++ b/repository.datadog.yaml @@ -11,5 +11,4 @@ branches: schema-version: v1 kind: mergegate # https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/4948100574/MergeGate rules: - - require: labels - require: commit-signatures From eb4b43a89676a7d908741a7fcfc4f681b42aea91 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 27 Jan 2026 10:06:12 -0600 Subject: [PATCH 4/6] Update repository.datadog.yaml Co-authored-by: Brice Dutheil --- repository.datadog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository.datadog.yaml b/repository.datadog.yaml index d6754ea172d..bb92e6e00af 100644 --- a/repository.datadog.yaml +++ b/repository.datadog.yaml @@ -9,6 +9,6 @@ branches: require_reason_for_skip_checks: true --- schema-version: v1 -kind: mergegate # https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/4948100574/MergeGate +kind: mergegate # https://datadoghq.atlassian.net/wiki/x/3gXuJgE rules: - require: commit-signatures From 6ec1542394fe85e87178d263e119f904a9f15784 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 27 Jan 2026 10:06:20 -0600 Subject: [PATCH 5/6] Update repository.datadog.yaml Co-authored-by: Brice Dutheil --- repository.datadog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository.datadog.yaml b/repository.datadog.yaml index bb92e6e00af..027003bb01a 100644 --- a/repository.datadog.yaml +++ b/repository.datadog.yaml @@ -1,6 +1,6 @@ --- schema-version: v1 -kind: mergequeue # https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/3121612126/MergeQueue +kind: mergequeue # https://datadoghq.atlassian.net/wiki/x/XgUQug enable: true merge_method: squash branches: From b31d45be4ff8c209b0902e60a96f017fe8b736f9 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 28 Jan 2026 11:05:32 -0500 Subject: [PATCH 6/6] Remove merge gate --- repository.datadog.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/repository.datadog.yaml b/repository.datadog.yaml index 027003bb01a..8d5c98b060a 100644 --- a/repository.datadog.yaml +++ b/repository.datadog.yaml @@ -7,8 +7,3 @@ branches: master: allow_skip_checks: true require_reason_for_skip_checks: true ---- -schema-version: v1 -kind: mergegate # https://datadoghq.atlassian.net/wiki/x/3gXuJgE -rules: - - require: commit-signatures