summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremiah Snapp <jeremiah@chef.io>2022-05-09 20:38:47 -0400
committerGitHub <noreply@github.com>2022-05-09 20:38:47 -0400
commit630f79c89bb25bf47de901e91dadd468a20d5a9d (patch)
tree7abecb575108381aae1e3c85a09aaf0aee1137a7
parent9d518ac61d6003f675f1860e3861c42895818632 (diff)
parent3f99a08722f1eb9fce497e672be8a531d6eac756 (diff)
downloadchef-630f79c89bb25bf47de901e91dadd468a20d5a9d.tar.gz
Merge pull request #12870 from chef/jsnapp/IPACK-126-add-platforms-to-chef-17
IPACK-126 Add platforms to chef-17
-rw-r--r--.expeditor/adhoc-canary.omnibus.yml3
-rw-r--r--.expeditor/release.omnibus.yml3
-rw-r--r--omnibus/Gemfile.lock8
3 files changed, 6 insertions, 8 deletions
diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml
index 1defa609d4..5ba6819503 100644
--- a/.expeditor/adhoc-canary.omnibus.yml
+++ b/.expeditor/adhoc-canary.omnibus.yml
@@ -38,8 +38,7 @@ builder-to-testers-map:
- el-8-aarch64
el-8-x86_64:
- el-8-x86_64
- freebsd-11-amd64:
- - freebsd-11-amd64
+ freebsd-12-amd64:
- freebsd-12-amd64
mac_os_x-10.15-x86_64:
- mac_os_x-10.15-x86_64
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 9fe59233b4..5a4501d48d 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -38,8 +38,7 @@ builder-to-testers-map:
- el-8-aarch64
el-8-x86_64:
- el-8-x86_64
- freebsd-11-amd64:
- - freebsd-11-amd64
+ freebsd-12-amd64:
- freebsd-12-amd64
mac_os_x-10.15-x86_64:
- mac_os_x-10.15-x86_64
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e45d7962c4..0420bc1329 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 7d5c5359c25ced333216e036b166ddbdb0b763fc
+ revision: 8a0e391d4232ab3fc5fb7a03b15932335a0214c4
branch: main
specs:
omnibus-software (4.0.0)
- omnibus (>= 8.0.0)
+ omnibus (>= 9.0.0)
GIT
remote: https://github.com/chef/omnibus.git
- revision: 27c37fc4a27533deda445bd0b44dcec1c674c329
+ revision: 63be4f1663fe28c35e762697500dab7dd88c4dbf
branch: main
specs:
- omnibus (8.3.3)
+ omnibus (9.0.0)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-utils (>= 15.4)