Merge pull request #223 from frederikbosch/patch-1

Ubuntu 18.04 is supported
dev-sec · Oct 15, 2018 · c919600 · c919600
2 parents ca2f5bc + 8ea268c
commit c919600
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,10 +47,7 @@ script:
 
 matrix:
   allow_failures: # temporaray disable failing tests until all problems are fixed
-    - env: INSTANCE=ubuntu-16-04 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
     - env: INSTANCE=ubuntu-16-04 CHEF_VERSION=12.14.60 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
-    - env: INSTANCE=ubuntu-18-04 KITCHEN_LOCAL_YAML=.kitchen.do.yml
-    - env: INSTANCE=ubuntu-18-04 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
     - env: INSTANCE=centos-7 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
     - env: INSTANCE=centos-7 CHEF_VERSION=12.14.60 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
     - env: INSTANCE=opensuse-42 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ It will not:
 ### Platform
 
 - Debian 7, 8
-- Ubuntu 14.04, 16.04
+- Ubuntu 14.04, 16.04, 18.04
 - RHEL 6, 7
 - CentOS 6, 7
 - Oracle Linux 6, 7