summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaymala <jsinha@chef.io>2019-07-03 15:35:17 -0400
committerGitHub <noreply@github.com>2019-07-03 15:35:17 -0400
commit90d2de54308ca3d60c1d791f7c055af1ae8803a9 (patch)
treed62dd76c833493bd4bb7d348a29420e5fe8c65c2
parentacf4753fc3c88c4ce4fbca5ff8f16f2e256cef19 (diff)
parent5398f72c418d5dd61f5e11e1824c0d7860c60fad (diff)
downloadchef-90d2de54308ca3d60c1d791f7c055af1ae8803a9.tar.gz
Merge pull request #8712 from chef/jsinha/build-ubuntu-16
Deprecate Ubuntu-14
-rw-r--r--.expeditor/release.omnibus.yml6
-rw-r--r--omnibus/README.md4
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!