Testing updates

Signed-off-by: Tim Smith <tsmith@chef.io>
sous-chefs · May 16, 2018 · e2d19f7 · e2d19f7
1 parent 399cd09
commit e2d19f7
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 91 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,8 +42,6 @@ vendor/
 .coverage/
 .zero-knife.rb
 Policyfile.lock.json
-Cheffile.lock
-.librarian/
 
 # vagrant stuff
 .vagrant/

diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
@@ -1,7 +1,7 @@
 driver:
   name: dokken
   privileged: true # because Docker and SystemD/Upstart
-  chef_version: current
+  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
 
 transport:
   name: dokken
@@ -11,70 +11,67 @@ provisioner:
   deprecations_as_errors: true
 
 platforms:
-  - name: centos-6
-    driver:
-      image: centos:6
-      platform: rhel
-      pid_one_command: /sbin/init
-      intermediate_instructions:
-        - RUN yum -y install which initscripts net-tools wget
-    run_list:
-      - recipe[mysql_test::yum_repo]
+- name: amazonlinux
+  driver:
+    image: dokken/amazonlinux
+    pid_one_command: /sbin/init
 
-  - name: centos-7
-    driver:
-      image: centos:7
-      platform: rhel
-      pid_one_command: /usr/lib/systemd/systemd
-      intermediate_instructions:
-        - RUN yum -y install lsof which systemd-sysv initscripts wget net-tools
-    run_list:
-      - recipe[mysql_test::yum_repo]
+- name: amazonlinux-2
+  driver:
+    image: dokken/amazonlinux-2
+    pid_one_command: /usr/lib/systemd/systemd
 
-  - name: debian-7
-    driver:
-      image: debian:7
-      pid_one_command: /sbin/init
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y
+- name: debian-8
+  driver:
+    image: dokken/debian-8
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
 
-  - name: debian-8
-    driver:
-      image: debian:8
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y
+- name: debian-9
+  driver:
+    image: dokken/debian-9
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
 
-  - name: fedora-24
-    driver:
-      image: fedora:24
-      pid_one_command: /usr/lib/systemd/systemd
-      intermediate_instructions:
-        - RUN dnf -y install which systemd-sysv initscripts wget net-tools
+- name: centos-6
+  driver:
+    image: dokken/centos-6
+    pid_one_command: /sbin/init
 
-  - name: ubuntu-14.04
-    driver:
-      image: ubuntu-upstart:14.04
-      pid_one_command: /sbin/init
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y
-    run_list:
-      - recipe[mysql_test::yum_repo]
+- name: centos-7
+  driver:
+    image: dokken/centos-7
+    pid_one_command: /usr/lib/systemd/systemd
 
-  - name: ubuntu-16.04
-    driver:
-      image: ubuntu:16.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y
+- name: fedora-latest
+  driver:
+    image: dokken/fedora-latest
+    pid_one_command: /usr/lib/systemd/systemd
 
-  - name: opensuse-leap
-    driver:
-      image: opensuse:leap
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive which hostname
+- name: ubuntu-14.04
+  driver:
+    image: dokken/ubuntu-14.04
+    pid_one_command: /sbin/init
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: ubuntu-16.04
+  driver:
+    image: dokken/ubuntu-16.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: ubuntu-18.04
+  driver:
+    image: dokken/ubuntu-18.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
+
+- name: opensuse-leap
+  driver:
+    image: dokken/opensuse-leap
+    pid_one_command: /bin/systemd
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -1,8 +1,8 @@
 <%
 dists_with_51 = %w(centos-6)
-dists_with_55 = %w(centos-6 centos-7 debian-7 debian-8 ubuntu-14.04)
-dists_with_56 = %w(centos-6 centos-7 fedora-25 ubuntu-14.04 opensuse-leap amazon-linux)
-dists_with_57 = %w(centos-6 centos-7 fedora-25 ubuntu-16.04)
+dists_with_55 = %w(centos-6 centos-7 debian-8 ubuntu-14.04)
+dists_with_56 = %w(centos-6 centos-7 fedora-27 ubuntu-14.04 opensuse-leap amazon-linux)
+dists_with_57 = %w(centos-6 centos-7 fedora-27 ubuntu-16.04)
 %>
 ---
 driver:
@@ -19,45 +19,34 @@ verifier:
 
 platforms:
   - name: centos-6
-    driver:
-      box: bento/centos-6
     run_list:
       - recipe[selinux::disabled]
       - recipe[mysql_test::yum_repo]
 
   - name: centos-7
-    driver:
-      box: bento/centos-7
     run_list:
       - recipe[selinux::disabled]
       - recipe[mysql_test::yum_repo]
 
-  - name: debian-7
-    driver:
-      box: bento/debian-7.11
 
   - name: debian-8
-    driver:
-      box: bento/debian-8.8
+
+  - name: debian-9
 
-  - name: fedora-26
-    driver:
-      box: bento/fedora-25
+  - name: fedora-27
     run_list:
       - recipe[selinux::disabled]
       - recipe[mysql_test::yum_repo]
 
   - name: opensuse-leap
     driver:
-      box: bento/opensuse-leap-42.2
+      box: bento/opensuse-leap-42
 
   - name: ubuntu-14.04
-    driver:
-      box: bento/ubuntu-14.04
 
   - name: ubuntu-16.04
-    driver:
-      box: bento/ubuntu-16.04
+
+  - name: ubuntu-18.04
 
   - name: amazonlinux
     driver_config:

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 sudo: required
-dist: trusty
 
 addons:
   apt:
@@ -25,32 +24,26 @@ env:
   - INSTANCE=smoke51-centos-6
   - INSTANCE=smoke55-centos-6
   - INSTANCE=smoke55-centos-7
-  - INSTANCE=smoke55-debian-7
   - INSTANCE=smoke55-debian-8
   - INSTANCE=smoke55-ubuntu-1404
   - INSTANCE=smoke56-centos-6
   - INSTANCE=smoke56-centos-7
-  #- INSTANCE=smoke56-fedora-24
   - INSTANCE=smoke56-ubuntu-1404
   - INSTANCE=smoke56-opensuse-leap
   - INSTANCE=smoke57-centos-6
   - INSTANCE=smoke57-centos-7
-  #- INSTANCE=smoke57-fedora-24
   - INSTANCE=smoke57-ubuntu-1604
   - INSTANCE=installation-client-package-51-centos-6
   - INSTANCE=installation-client-package-55-centos-6
   - INSTANCE=installation-client-package-55-centos-7
-  - INSTANCE=installation-client-package-55-debian-7
   - INSTANCE=installation-client-package-55-debian-8
   - INSTANCE=installation-client-package-55-ubuntu-1404
   - INSTANCE=installation-client-package-56-centos-6
   - INSTANCE=installation-client-package-56-centos-7
-  #- INSTANCE=installation-client-package-56-fedora-24
   - INSTANCE=installation-client-package-56-ubuntu-1404
   - INSTANCE=installation-client-package-56-opensuse-leap
   - INSTANCE=installation-client-package-57-centos-6
   - INSTANCE=installation-client-package-57-centos-7
-  #- INSTANCE=installation-client-package-57-fedora-24
   - INSTANCE=installation-client-package-57-ubuntu-1604
 
 before_script:

diff --git a/Gemfile b/Gemfile
@@ -6,5 +6,4 @@
 
 source 'https://rubygems.org'
 
-gem 'stove'
 gem 'community_cookbook_releaser'