[OPTMZT-89]: Update image policies for 2025

brentmmarks · brentmmarks · commit 26aee3c3869a · 2025-06-10T15:42:52.000-04:00
diff --git a/jekyll/_cci2/android-images-support-policy.adoc b/jekyll/_cci2/android-images-support-policy.adoc
@@ -37,8 +37,6 @@ For the latest major version of Docker:
 
 - `edge`: These tags are reserved for previews of new releases, which will initially point to this tag. The `edge` tags may include incremental updates to the `current` image release, which may change without notice, and is not recommended to be used for production CI workloads. `current` will be updated with these changes after a period of stability (generally an average of a week).
 
-- Date based tagging: Android images are generally released once every 3 months. The date-based tagging conventions take the format of `<year>.<month>.<patch>`, such as `2023.10.1`. We recommend using the `default` version and not pinning to a date version.
-
 [#critical-cve-patches]
 == Critical CVE patches
 
@@ -52,24 +50,9 @@ File a link:https://support.circleci.com/hc/en-us/requests/new[Support Ticket wi
 [#image-lifespan-eol]
 == Image lifespan / EOL
 
-We will keep a total of seven images at maximum, with a deprecation cycle happening once per year. The table below shows which images will be kept in each cycle. Generally we will aim to start EOL process within 3 months of a new version release.
-
-Current Deprecation (Jan 2024):
-
-[.table.table-striped]
-[cols=2*, options="header", stripes=even]
-|===
-| Release cycle
-| Image status
-
-| Current year
-| Keep all quarterly images of this year. Keep Q4 (October) image release of the last 2 years
-
-|===
-
-When an image is selected for deprecation and removal, we will create an announcement on our Discuss forum, along with reaching out via email to developers who have requested one of the deprecated images in their recent jobs.
+When a new API Level for Android is released we will release it to edge and give a 3 month warning before the default image will have oldest version no longer supported. We will create an announcement on our Discuss forum, along with reaching out via email to developers who may be impacted by this change.
 
-We will also plan brownouts to ensure users are aware of the approaching removal of deprecated images. Generally, we will aim to start an EOL process within 3 months of a new version release.
+Generally we will aim to start EOL process within 3 months of a new version release.
 
 [#exceptions]
 == Exceptions
diff --git a/jekyll/_cci2/android-machine-image.adoc b/jekyll/_cci2/android-machine-image.adoc
@@ -54,7 +54,7 @@ workflows:
           executor:
             name: android/android-machine
             resource-class: large
-            tag: 2021.10.1
+            tag: default
 ```
 
 [#more-complex-orb-usage]
@@ -75,7 +75,7 @@ jobs:
     executor:
       name: android/android-machine
       resource-class: large
-      tag: 2021.10.1
+      tag: default
     steps:
       - checkout
       # Create an AVD named "myavd"
diff --git a/jekyll/_cci2/linux-vm-support-policy.adoc b/jekyll/_cci2/linux-vm-support-policy.adoc
@@ -31,13 +31,9 @@ Tags we support for this image (tag is what is specified in `.circleci/config.ym
 
 - `current` version of the image will receive updates approximately every three months.
 
-- `previous` version of the image will receive the previous version of `current`.
-
 - `edge` tags are reserved for previews of new releases, which will initially point to this tag. The edge tags may include incremental updates to the current quarterly (every 3 months) image release, which may change without notice, and is not recommended to be used for production CI workloads. `current` will be updated with these changes after a period of stability.
 
-- Date based tagging: The Ubuntu LTS based images have the image slug format of: `ubuntu-<LTS version>:<year>.<month>.<patch>`, such as `ubuntu-2204:2023.10.1`. We recommend using the `default` version and not pinning to a date version.
-
-We always aim to release a version of this image every three months.
+We always aim to release a version of this image every three months. Tags will be supported on all versions we support.
 
 [#critical-cve-patches]
 == Critical CVE patches
@@ -63,10 +59,8 @@ Current Deprecation (Jan 2024):
 | Support
 
 | Ubuntu 20.04 LTS
-| Build quarterly images for current year and retain Q4 (October) release from the past two years.
 
 | Ubuntu 22.04 LTS
-| Quarterly images built and only Q4 image retained each year
 |===
 
 
@@ -82,10 +76,10 @@ Example: When Ubuntu 24.04 LTS is released
 | Deprecated and removed entirely
 
 | Ubuntu 22.04 LTS
-| Retain only Q4 (October) releases from past two years
+| `current` and `edge` tags retained
 
 | Ubuntu 24.04 LTS
-| Quarterly images built and only Q4 (October) image retained from each year
+| `current` and `edge` tags retained
 |===
 
 When an image is selected for deprecation and removal, we will create an announcement on our Discuss forum, along with reaching out via email to developers who have requested one of the deprecated images in their recent jobs.
diff --git a/jekyll/_cci2/remote-docker-images-support-policy.adoc b/jekyll/_cci2/remote-docker-images-support-policy.adoc
@@ -21,7 +21,7 @@ This document outlines the xref:building-docker-images#[CircleCI remote Docker i
 
 The CircleCI remote Docker images are based on our Linux VM images with Docker installed for the purposes of providing a remote environment that can execute Docker commands within jobs on the Docker executor.
 
-We aim to support the latest two versions of the Docker Engine that are classified as within Security Support status.
+We aim to support the latest three versions of the Docker Engine that are classified as within Security Support status.
 
 Remote Docker images will be updated when a patch version is released upstream. Tags will be redirected to the updated images automatically as described in the xref:#tagging[tagging] section of this document. We will announce these releases on our link:https://discuss.circleci.com/[Discuss Forum].
 
@@ -36,9 +36,7 @@ For the latest major version of Docker:
 
 - `edge`: This tag is reserved for previews of new releases, which will initially point to this tag. The tag may include incremental updates relative to the current quarterly image release, which may change without notice, and is not recommended for production CI workloads.
 
-- `previous`: Once an `edge` image is promoted to `default`, the previous `default` image is moved to the `previous` tag.
-
-For the previous major version of Docker, we support a single tag following the format of `dockerXX`, for example, `docker23` for Docker 23. This tag will point to the latest patch version of the major release, and will be updated if any patch versions are issued upstream. We recommend using the default version.
+For the previous major version of Docker, we support a single tag following the format of `dockerXX`, for example, `docker27` for Docker 27. This tag will point to the latest patch version of the major release, and will be updated if any patch versions are issued upstream. We recommend using the default version.
 
 [#critical-cve-patches]
 == Critical CVE patches
@@ -63,35 +61,35 @@ Current Deprecation:
 | Version
 | Support
 
-| Docker 20
-| We will support one version of Docker 20 with a tag of `20.10.24`
+| Docker 25
+| `docker25` tag is maintained for Docker 25 support
 
-| Docker 23
-| `docker23` tag is maintained for Docker 23 support
+| Docker 26
+| `docker26` tag is maintained for Docker 26 support
 
-| Docker 24
-| Set to `default`, `edge` and `previous` tags
+| Docker 27
+| Set to `default` and `edge` tags. `docker27` tag is maintained for Docker 27 as default tag as well.
 |===
 
-Example: When Docker 25 is released:
+Example: When Docker 28 is released:
 
 [.table.table-striped]
 [cols=2*, options="header", stripes=even]
 |===
 | Version
 | Support
 
-| Docker 20
+| Docker 25
 | Deprecated and removed
 
-| Docker 23
-| `docker23` tag is frozen and kept until next cycle
+| Docker 26
+| `docker26` tag kept until next cycle
 
-| Docker 24
-| Moved from `default`, `edge` and `previous` tags to `docker24` tag
+| Docker 27
+| Moved from `default` and `edge` tags to `docker27` tag only
 
-| Docker 25
-| Set to `default`, `edge` and `previous` tags
+| Docker 28
+| Set to `default` and `edge` tags. With `docker28` tag for pinning docker version.
 |===
 
 
diff --git a/jekyll/_cci2/windows-images-support-policy.adoc b/jekyll/_cci2/windows-images-support-policy.adoc
@@ -33,8 +33,6 @@ We support various tags for the Windows environment, allowing you to choose a su
 
 - `edge`: tags are reserved for previews of new releases, which will initially point to this tag. The `edge` tags may include incremental updates to the current quarterly image release, which may change without notice, and is not recommended to be used for production CI workloads. `current` will be updated with these changes after a period of stability.
 
-- `previous`: version of Windows Server will receive the previous version of `current`.
-
 We generally install the latest Major version of Visual Studio Community Edition that coincides with the Windows Server version in the image when it is built.
 
 We always aim to release a version of the supported windows images (for example, currently this is `Windows server 2019` and `Windows server 2022`) every 3 months. We recommend using the `default` version and not pinning to a date version.
@@ -44,8 +42,6 @@ We always aim to release a version of the supported windows images (for example,
 
 The variant of Windows Server can be specified by choosing the name parameter in the Windows orb. The most recent version of Windows Server will always be accessible via the `win/default` name, but previous versions require explicit definition, such as `win/server-2019`.
 
-Each quarterly (published every 3 months) image for the `current` tag Windows Server version is published to a date-based tag, such as `2023.10.1`, which can be explicitly defined in the version parameter of the orb.
-
 [#critical-cve-patches]
 == Critical CVE patches
 
@@ -72,10 +68,10 @@ Current deprecation (Jan 2024):
 | Support
 
 | Windows Server 2019
-| Build quarterly images and retain Q4 (October) releases from previous two years
+| `current` and `edge` tags retained
 
 | Windows Server 2022
-| Build quarterly images and only Q4 (October) releases retained each year
+| `current` and `edge` tags retained
 |===
 
 Example: When Windows Server 2025 is released
@@ -90,10 +86,10 @@ Example: When Windows Server 2025 is released
 | Deprecated and removed entirely
 
 | Windows Server 2022
-| Retain only current and past two Q4 (October) releases
+| `current` and `edge` tags retained
 
 | Windows Server 2025
-| Quarterly images built and only Q4 (October) image retained each year
+| `current` and `edge` tags retained
 |===
 
 When an image is selected for deprecation and removal, we will create an announcement on our Discuss forum, along with reaching out via email to developers who have requested one of the deprecated images in their recent jobs.
diff --git a/jekyll/_cci2/xcode-policy.adoc b/jekyll/_cci2/xcode-policy.adoc
@@ -22,50 +22,47 @@ You will find the most up to date information on these images on the link:https:
 
 We aim to retain four major versions of Xcode, with more recent versions having a larger number of minor versions to choose from.
 
-For example, with Xcode 14 being the latest major version being released:
+For example, with Xcode 16 being the latest major version being released:
 
 [.table.table-striped]
 [cols=2*, options="header", stripes=even]
 |===
 | Xcode Version | Action
 
-| Xcode 14
+| Xcode 16
 | We will retain all `major.minor` versions at the latest patch version
 
-| Xcode 13
+| Xcode 15
 | We will retain the 4 latest `major.minor` versions at the latest patch version
 
-| Xcode 12
-| We retain a single image which will be the last stable release of Xcode 12
-
-| Xcode 11
-| We retain a single image which will be the last stable release of Xcode 11
+| Xcode 14
+| We retain a single image which will be the last stable release of Xcode 14
 
-| Xcode 10
-| Removed entirely
+| Xcode 13
+| We retain a single image which will be the last stable release of Xcode 13
 |===
 
-Future example, when Xcode 15 enters Beta:
+Future example, when Xcode 26 enters Beta:
 
 [.table.table-striped]
 [cols=2*, options="header", stripes=even]
 |===
 | Xcode Version | Action
 
-| Xcode 15
+| Xcode 26
 | Beta image will be released and updated as per the beta image policy
 
-| Xcode 14
-| The latest 4 `major.minor` versions will be retained at the latest patch version, older images will be flagged for deprecation and removed when Xcode 15 reaches RC
+| Xcode 16
+| The latest 4 `major.minor` versions will be retained at the latest patch version, older images will be flagged for deprecation and removed when Xcode 26 reaches RC
 
-| Xcode 13
-| All images except for the final release will be flagged for deprecation and removed when Xcode 15 reaches RC
+| Xcode 15
+| All images except for the final release will be flagged for deprecation and removed when Xcode 26 reaches RC
 
-| Xcode 12
-| All images except for the final release will be flagged for deprecation and removed when Xcode 15 reaches RC
+| Xcode 14
+| All images except for the final release will be flagged for deprecation and removed when Xcode 26 reaches RC
 
-| Xcode 11
-| Flagged for deprecation, removed entirely when Xcode 15 reaches RC
+| Xcode 13
+| Flagged for deprecation, removed entirely when Xcode 26 reaches RC
 |===
 
 Betas of new major versions of Xcode are shipped by Apple during WWDC, which usually occurs in early-mid June each year.
