summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.expeditor/release.omnibus.yml32
-rw-r--r--omnibus/Gemfile4
-rw-r--r--omnibus/Gemfile.lock4
3 files changed, 4 insertions, 36 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 0736e929a5..14052ddc0d 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -5,11 +5,7 @@ test-path: omnibus/omnibus-test.sh
test-path-windows: omnibus/omnibus-test.ps1
fips-platforms:
- el-*-x86_64
- - windows-*
builder-to-testers-map:
- aix-7.1-powerpc:
- - aix-7.1-powerpc
- - aix-7.2-powerpc
debian-9-x86_64:
- debian-9-x86_64
- debian-10-x86_64
@@ -21,13 +17,6 @@ builder-to-testers-map:
- el-7-aarch64
- el-8-aarch64
- amazon-2-aarch64
- el-7-ppc64:
- - el-7-ppc64
- el-7-ppc64le:
- - el-7-ppc64le
- el-7-s390x:
- - el-7-s390x
- - el-8-s390x
el-7-x86_64:
- el-7-x86_64
- el-8-x86_64
@@ -35,35 +24,14 @@ builder-to-testers-map:
freebsd-11-amd64:
- freebsd-11-amd64
- freebsd-12-amd64
- mac_os_x-10.13-x86_64:
- - mac_os_x-10.13-x86_64
- - mac_os_x-10.14-x86_64
- - mac_os_x-10.15-x86_64
- - mac_os_x-11.0-x86_64
- sles-12-s390x:
- - sles-12-s390x
- - sles-15-s390x
sles-12-x86_64:
- sles-12-x86_64
- sles-15-x86_64
sles-15-aarch64:
- sles-15-aarch64
- solaris2-5.11-i386:
- - solaris2-5.11-i386
- solaris2-5.11-sparc:
- - solaris2-5.11-sparc
ubuntu-18.04-aarch64:
- ubuntu-18.04-aarch64
- ubuntu-20.04-aarch64
ubuntu-18.04-x86_64:
- ubuntu-18.04-x86_64
- ubuntu-20.04-x86_64
- windows-2012r2-i386:
- - windows-2012r2-i386
- windows-2012r2-x86_64:
- - windows-2012-x86_64
- - windows-2012r2-x86_64
- - windows-2016-x86_64
- - windows-2019-x86_64
- - windows-8-x86_64
- - windows-10-x86_64
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index df94943a3d..e8c99d9b85 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "optimizations"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
gem "artifactory"
@@ -21,4 +21,4 @@ group :development do
gem "test-kitchen", ">= 1.23"
gem "kitchen-vagrant", ">= 1.3.1"
gem "winrm-fs", "~> 1.0"
-end \ No newline at end of file
+end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bfbce0b3a7..eb9b78152c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/chef/omnibus
- revision: aeda0bb23bfe19b52fb50a410e67c2727a44dec4
- branch: master
+ revision: 195b5d6a4791fd4d1e4e415f9de945dc118c25a1
+ branch: optimizations
specs:
omnibus (8.0.14)
aws-sdk-s3 (~> 1)