Merge pull request #3189 from chef/ashiqueps/CHEF-7280-Remove-macos-1…

…0.15-references Removed the references of MacOS 10.15
chef · Nov 30, 2023 · 2940766 · 2940766
2 parents 4741828 + 9673412
commit 2940766
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 42 deletions.
diff --git a/.expeditor/create_pr_for_homebrew.sh b/.expeditor/create_pr_for_homebrew.sh
@@ -5,7 +5,7 @@ FORK_OWNER="chef"
 UPSTREAM_OWNER="Homebrew"
 REPO_NAME="homebrew-cask"
 BRANCH="${EXPEDITOR_PRODUCT_KEY}-${EXPEDITOR_VERSION}"
-URL="https://omnitruck.chef.io/stable/$EXPEDITOR_PRODUCT_KEY/metadata?p=mac_os_x&pv=10.15&m=x86_64&v=$EXPEDITOR_VERSION"
+URL="https://omnitruck.chef.io/stable/$EXPEDITOR_PRODUCT_KEY/metadata?p=mac_os_x&pv=11&m=x86_64&v=$EXPEDITOR_VERSION"
 SHA=""
 
 echo "--- Getting $FORK_OWNER/$REPO_NAME repository and updating latest from upstream $UPSTREAM_OWNER/$REPO_NAME"

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
@@ -53,7 +53,7 @@ In slack, run the `/expeditor promote chef-workstation 20.10.168` and supply the
 
 ### Common Failures
 
-Sometimes the Omnitruck cache takes a long time to refresh. If you run `curl 'https://omnitruck.chef.io/stable/chef-workstation/metadata?p=mac_os_x&pv=10.15&m=x86_64&v=latest'` and it does not return the version you just promoted, the omnitruck cache has not been updated. Run this periodically (it can sometimes take a few hours) and retry the failed portion of the promote process after the correct version is returned. Retries can be performed on the Expeditor messages in `#chef-ws-notify`.
+Sometimes the Omnitruck cache takes a long time to refresh. If you run `curl 'https://omnitruck.chef.io/stable/chef-workstation/metadata?p=mac_os_x&pv=11&m=x86_64&v=latest'` and it does not return the version you just promoted, the omnitruck cache has not been updated. Run this periodically (it can sometimes take a few hours) and retry the failed portion of the promote process after the correct version is returned. Retries can be performed on the Expeditor messages in `#chef-ws-notify`.
 
 The released package is also uploaded to Homebrew and Chocolatey via a triggered [third party packages](https://buildkite.com/chef/chef-chef-workstation-main-third-party-packages) pipeline. This often fails if the Omnitruck cache is slow to update. Continue retrying the Chocolatey pipeline after Omnitruck has refreshed and it should eventually succeed.
 

diff --git a/docs-chef-io/content/workstation/install_workstation.md b/docs-chef-io/content/workstation/install_workstation.md
@@ -19,46 +19,17 @@ aliases = ["/install_workstation.html", "/install_dk.html", "/workstation_window
 
 ## Supported Platforms
 
-Supported Host Operating Systems:
-
-<table>
-<colgroup>
-<col style="width: 50%" />
-<col style="width: 50%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Platform</th>
-<th>Version</th>
-</tr>
-</thead>
-<tbody>
-<tr class="even">
-<td>Amazon Linux</td>
-<td>2</td>
-</tr>
-<tr class="odd">
-<td>Apple macOS</td>
-<td>10.15, 11, 12</td>
-</tr>
-<tr class="even">
-<td>Windows</td>
-<td>10, 11, Server 2012, Server 2012 R2, Server 2016, Server 2019, Server 2022</td>
-</tr>
-<tr class="odd">
-<td>Red Hat Enterprise Linux / CentOS</td>
-<td>7.x, 8.x, 9.x</td>
-</tr>
-<tr class="even">
-<td>Ubuntu</td>
-<td>18.04, 20.04, 22.04</td>
-</tr>
-<tr class="odd">
-<td>Debian</td>
-<td>10, 11</td>
-</tr>
-</tbody>
-</table>
+The following table lists the commercially supported platforms and versions for Chef Workstation:
+
+{{< readfile file = "content/workstation/reusable/md/workstation_supported_platforms.md" >}}
+
+### Derived Platforms
+
+The following table lists supported derived platforms and versions for Chef Workstation.
+
+See our policy on [support for derived platforms](/platforms/#support-for-derived-platforms) for more information.
+
+{{< readfile file = "content/workstation/reusable/md/workstation_supported_derived_platforms.md" >}}
 
 ## System Requirements
 

diff --git a/...f-io/content/workstation/reusable/md/workstation_supported_derived_platforms.md b/...f-io/content/workstation/reusable/md/workstation_supported_derived_platforms.md
@@ -0,0 +1,4 @@
+| Platform | Architecture | Version | Parent platform |
+| --- | --- | --- | --- |
+| AlmaLinux | `x86_64` | `8.x` | CentOS |
+| Rocky Linux | `x86_64` | `8.x` | CentOS |
diff --git a/docs-chef-io/content/workstation/reusable/md/workstation_supported_platforms.md b/docs-chef-io/content/workstation/reusable/md/workstation_supported_platforms.md
@@ -0,0 +1,8 @@
+| Platform                          | Architecture    | Version                                                                    |
+|-----------------------------------| ----------------| ---------------------------------------------------------------------------|
+| Amazon Linux                      | x86_64          | 2.x                                                                        |
+| macOS                             | x86_64, arch64  | 11.x, 12.x                                                                 |
+| Debian                            | x86_64          | 10, 11                                                                     |
+| Red Hat Enterprise Linux / CentOS | x86_64          | 7.x, 8.x, 9.x                                                              |
+| Ubuntu                            | x86_64          | 18.04, 20.04, 22.04                                                        |
+| Windows                           | x64             | 10, 11, Server 2012, Server 2012 R2, Server 2016, Server 2019, Server 2022 |