diff options
-rw-r--r-- | .expeditor/release.omnibus.yml | 6 | ||||
-rw-r--r-- | omnibus/README.md | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index edd03f7bf0..8c20a5c3aa 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -48,12 +48,6 @@ builder-to-testers-map: - solaris-11-i86pc solaris-11-sparc: - solaris-11-sparc - ubuntu-14.04-i386: - - ubuntu-14.04-i386 - ubuntu-14.04-ppc64le: - - ubuntu-14.04-ppc64le - ubuntu-14.04-x86_64: - - ubuntu-14.04-x86_64 ubuntu-16.04-x86_64: - ubuntu-16.04-x86_64 - ubuntu-18.04-x86_64 diff --git a/omnibus/README.md b/omnibus/README.md index aa58d6da5e..34e503519f 100644 --- a/omnibus/README.md +++ b/omnibus/README.md @@ -67,7 +67,7 @@ The default build environment requires Test Kitchen and VirtualBox for local dev Once you have tweaked your `kitchen.yml` (or `kitchen.local.yml`) to your liking, you can bring up an individual build environment using the `kitchen` command. ```shell -$ bundle exec kitchen converge chef-ubuntu-1404 +$ bundle exec kitchen converge chef-ubuntu-1604 ``` Additional settings are required if using the kitchen-vagrant driver with the Hyper-V provider: @@ -87,7 +87,7 @@ $ bundle exec kitchen login <PROJECT>-ubuntu-1204 ``` ```shell -$ kitchen login chef-ubuntu-1404 +$ kitchen login chef-ubuntu-1604 [vagrant@ubuntu...] $ source load-omnibus-toolchain.sh [vagrant@ubuntu...] $ cd chef/omnibus [vagrant@ubuntu...] $ bundle install --without development # Don't install dev tools! |