summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-04-03 09:11:19 -0700
committerGitHub <noreply@github.com>2020-04-03 09:11:19 -0700
commitf635a332cece3aea50fdbb625395cd5d7ccd62d4 (patch)
tree28eccbd1ff0b025bd0ad7c012e71b1612b7b6a6b
parent24ef44b44ea8486f8c5c99bbbb16aebff79c2346 (diff)
parent735e4fbfd0f086e73421caabb3aa5bd355698b42 (diff)
downloadchef-f635a332cece3aea50fdbb625395cd5d7ccd62d4.tar.gz
Merge pull request #9587 from chef/swap_ubuntu
Swap Ubuntu 20.04 for 18.04 aarch64
-rw-r--r--.expeditor/release.omnibus.yml3
-rw-r--r--RELEASE_NOTES.md4
2 files changed, 4 insertions, 3 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 14be74e85e..a71174b002 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -45,10 +45,11 @@ builder-to-testers-map:
- solaris2-5.11-i386
solaris2-5.11-sparc:
- solaris2-5.11-sparc
+ ubuntu-18.04-aarch64:
+ - ubuntu-18.04-aarch64
ubuntu-16.04-x86_64:
- ubuntu-16.04-x86_64
- ubuntu-18.04-x86_64
- - ubuntu-20.04-x86_64
windows-2012r2-i386:
- windows-2012r2-i386
windows-2012r2-x86_64:
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 587f2fb2f5..3989a5bf9d 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -36,9 +36,9 @@ Resolved failures in the `windows_share` resource when setting the `path` proper
## Platform Support
-### Ubuntu 20.04
+### Ubuntu 18.04 aarch64
-Chef Infra Client is now tested on Ubuntu 20.04 with packages available on the [Chef Downloads Page](https://downloads.chef.io/chef).
+Chef Infra Client is now tested on Ubuntu 18.04 aarch64 with packages available on the [Chef Downloads Page](https://downloads.chef.io/chef).
### Windows 10