From de72597723738bd5d1e55db2c25100cf616ff751 Mon Sep 17 00:00:00 2001
From: Derek Ferguson <dferguson@gitlab.com>
Date: Thu, 20 Apr 2023 23:07:07 +0000
Subject: [PATCH] Change Required Pipeline Configuration removal date to 17.0

---
 .../15-9-required-pipeline-configuration.yml  |  8 ++---
 doc/update/deprecations.md                    | 32 +++++++++----------
 .../settings/continuous_integration.md        | 11 ++++---
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/data/deprecations/15-9-required-pipeline-configuration.yml b/data/deprecations/15-9-required-pipeline-configuration.yml
index 4aa3a83c51e7e..03ebaab555d59 100644
--- a/data/deprecations/15-9-required-pipeline-configuration.yml
+++ b/data/deprecations/15-9-required-pipeline-configuration.yml
@@ -3,13 +3,13 @@
 #
 - title: "Required Pipeline Configuration is deprecated"  # (required) Clearly explain the change, or planned change. For example, "The `confidential` field for a `Note` is deprecated" or "CI/CD job names will be limited to 250 characters."
   announcement_milestone: "15.9"  # (required) The milestone when this feature was first announced as deprecated.
-  removal_milestone: "16.0"  # (required) The milestone when this feature is planned to be removed
+  removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
   breaking_change: true  # (required) Change to false if this is not a breaking change.
-  reporter: jheimbuck_gl  # (required) GitLab username of the person reporting the change
-  stage: Verify  # (required) String value of the stage that the feature was created in. e.g., Growth
+  reporter: derekferguson  # (required) GitLab username of the person reporting the change
+  stage: Compliance Management  # (required) String value of the stage that the feature was created in. e.g., Growth
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389467  # (required) Link to the deprecation issue in GitLab
   body: |  # (required) Do not modify this line, instead modify the lines below.
-    Required Pipeline Configuration will be removed in the 16.0 release. This impacts self-managed users on the Ultimate license.
+    Required Pipeline Configuration will be removed in the 17.0 release. This impacts self-managed users on the Ultimate license.
 
     We recommend replacing this with an alternative [compliance solution](https://docs.gitlab.com/ee/user/group/compliance_frameworks.html#compliance-pipelines)
     that is available now. We recommend this alternative solution because it provides greater flexibility, allowing required pipelines to be assigned to specific compliance framework labels.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 4eb34a5a4af3a..1ebfff9acc57a 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -268,6 +268,22 @@ to the `gitlab-runner register` command.
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### Required Pipeline Configuration is deprecated
+
+<div class="deprecation-notes">
+- Announced in: GitLab <span class="milestone">15.9</span>
+- [Breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/)
+</div>
+
+Required Pipeline Configuration will be removed in the 17.0 release. This impacts self-managed users on the Ultimate license.
+
+We recommend replacing this with an alternative [compliance solution](https://docs.gitlab.com/ee/user/group/compliance_frameworks.html#compliance-pipelines)
+that is available now. We recommend this alternative solution because it provides greater flexibility, allowing required pipelines to be assigned to specific compliance framework labels.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Self-managed certificate-based integration with Kubernetes
 
 <div class="deprecation-notes">
@@ -1546,22 +1562,6 @@ This could be a breaking change for anyone that developed their own runner that
 
 <div class="deprecation breaking-change" data-milestone="16.0">
 
-### Required Pipeline Configuration is deprecated
-
-<div class="deprecation-notes">
-- Announced in: GitLab <span class="milestone">15.9</span>
-- [Breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/)
-</div>
-
-Required Pipeline Configuration will be removed in the 16.0 release. This impacts self-managed users on the Ultimate license.
-
-We recommend replacing this with an alternative [compliance solution](https://docs.gitlab.com/ee/user/group/compliance_frameworks.html#compliance-pipelines)
-that is available now. We recommend this alternative solution because it provides greater flexibility, allowing required pipelines to be assigned to specific compliance framework labels.
-
-</div>
-
-<div class="deprecation breaking-change" data-milestone="16.0">
-
 ### SAST analyzer coverage changing in GitLab 16.0
 
 <div class="deprecation-notes">
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index 5d5cd15372a52..a0a0dc6509972 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -245,12 +245,13 @@ To enable or disable the banner:
 
 ## Required pipeline configuration **(ULTIMATE SELF)**
 
-> [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/352316) from GitLab Premium to GitLab Ultimate in 15.0.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/352316) from GitLab Premium to GitLab Ultimate in 15.0.
+> - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/389467) in GitLab 15.9.
 
-NOTE:
-An alternative [compliance solution](../../group/compliance_frameworks.md#compliance-pipelines)
-is available. We recommend this alternative solution because it provides greater flexibility,
-allowing required pipelines to be assigned to specific compliance framework labels.
+WARNING:
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/389467) in GitLab 15.9
+and is planned for removal in 17.0. Use [compliance pipelines](../../group/compliance_frameworks.md#compliance-pipelines)
+instead. This change is a breaking change.
 
 You can set a [CI/CD template](../../../ci/examples/index.md#cicd-templates)
 as a required pipeline configuration for all projects on a GitLab instance. You can
-- 
GitLab