From 1a33edac6faa6fd9beecdc9af27ebef2079cfa2b Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Fri, 19 Jan 2024 19:09:00 +0000
Subject: [PATCH] Announce AutoDevops heroku builder image upgrade for 17.0

---
 ...utodevops-build-heroku-builder-upgrade.yml | 19 ++++++++++++++++++
 doc/update/deprecations.md                    | 20 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 data/deprecations/16-9-autodevops-build-heroku-builder-upgrade.yml

diff --git a/data/deprecations/16-9-autodevops-build-heroku-builder-upgrade.yml b/data/deprecations/16-9-autodevops-build-heroku-builder-upgrade.yml
new file mode 100644
index 0000000000000..541ee0dec273c
--- /dev/null
+++ b/data/deprecations/16-9-autodevops-build-heroku-builder-upgrade.yml
@@ -0,0 +1,19 @@
+- title: "Heroku image upgrade in Auto DevOps build"
+  # The milestones for the deprecation announcement, and the removal.
+  removal_milestone: "17.0"
+  announcement_milestone: "16.9"
+  # Change breaking_change to false if needed.
+  breaking_change: true
+  # The stage and GitLab username of the person reporting the change,
+  # and a link to the deprecation issue
+  reporter: timofurrer
+  stage: deploy
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437937
+  body: |  # (required) Don't change this line.
+    In GitLab 17.0, the `auto-build-image` project will upgrade from the `heroku/builder:20` image to `heroku/builder:22`.
+
+    To test the behavior of the new image, set the CI/CD variable `AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER` to
+    `heroku/builder:22`.
+
+    To continue to use `heroku/builder:20` after GitLab 17.0,
+    set `AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER` to `heroku/builder:20`.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index a0d1451c2cefd..aaa03d847b658 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -795,6 +795,26 @@ In GitLab 16.0 and later:
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### Heroku image upgrade in Auto DevOps build
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.9</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/437937).
+</div>
+
+In GitLab 17.0, the `auto-build-image` project will upgrade from the `heroku/builder:20` image to `heroku/builder:22`.
+
+To test the behavior of the new image, set the CI/CD variable `AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER` to
+`heroku/builder:22`.
+
+To continue to use `heroku/builder:20` after GitLab 17.0,
+set `AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER` to `heroku/builder:20`.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Internal container registry API tag deletion endpoint
 
 <div class="deprecation-notes">
-- 
GitLab