From b7d380e5c7ef04c347071c7fcceaf08a7dada50b Mon Sep 17 00:00:00 2001
From: Dov Hershkovitch <dhershkovitch@gitlab.com>
Date: Thu, 9 Dec 2021 11:10:55 +0000
Subject: [PATCH] Create deprecation entry for types keyword

---
 data/deprecations/14-6-deprecate-types.yml | 14 ++++++++++++++
 doc/update/deprecations.md                 |  6 ++++++
 2 files changed, 20 insertions(+)
 create mode 100644 data/deprecations/14-6-deprecate-types.yml

diff --git a/data/deprecations/14-6-deprecate-types.yml b/data/deprecations/14-6-deprecate-types.yml
new file mode 100644
index 0000000000000..ca639df9e29f1
--- /dev/null
+++ b/data/deprecations/14-6-deprecate-types.yml
@@ -0,0 +1,14 @@
+- name: "Remove `type` and `types` keyword in CI/CD configuration" # The name of the feature to be deprecated
+  announcement_milestone: "14.6" # The milestone when this feature was first announced as deprecated.
+  announcement_date: "2021-12-22" # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  removal_milestone: "15.0" # The milestone when this feature is planned to be removed
+  body: | # Do not modify this line, instead modify the lines below.
+   The `type` and `types` CI/CD keywords will be removed in GitLab 15.0. Pipelines that use these keywords will stop working, so you must switch to `stage` and `stages`, which have the same behavior.
+# The following items are not published on the docs page, but may be used in the future.
+  stage: # (optional - may be required in the future) String value of the stage that the feature was created in. e.g., Growth
+  tiers: # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
+  issue_url: # (optional) This is a link to the deprecation issue in GitLab
+  documentation_url: # (optional) This is a link to the current documentation page
+  image_url: # (optional) This is a link to a thumbnail image depicting the feature
+  video_url: # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
+  removal_date: # (optional - may be required in the future) YYYY-MM-DD format. This should almost always be the 22nd of a month (YYYY-MM-22), the date of the milestone release when this feature is planned to be removed
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index aafaabad81f48..066c91b7dd929 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -213,6 +213,12 @@ In GitLab 14.5, we introduced the command `gitlab-ctl promote` to promote any Ge
 
 Announced: 2021-11-22
 
+### Remove `type` and `types` keyword in CI/CD configuration
+
+The `type` and `types` CI/CD keywords will be removed in GitLab 15.0. Pipelines that use these keywords will stop working, so you must switch to `stage` and `stages`, which have the same behavior.
+
+Announced: 2021-12-22
+
 ### Remove the `:dependency_proxy_for_private_groups` feature flag
 
 We added a feature flag because [GitLab-#11582](https://gitlab.com/gitlab-org/gitlab/-/issues/11582) changed how public groups use the Dependency Proxy. Prior to this change, you could use the Dependency Proxy without authentication. The change requires authentication to use the Dependency Proxy.
-- 
GitLab