Merge pull request #6611 from chef/amazon_testing

Add Amazon Linux testing to PRs in Travis

5 files changed, 267 insertions, 126 deletions

diff --git a/.travis.yml b/.travis.yml
index 80effc9fcf..a28873d849 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,6 +103,24 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
+      - bundle exec kitchen test base-amazonlinux
+    after_failure:
+      - cat .kitchen/logs/kitchen.log
+    env:
+      - AMAZON=LATEST
+      - KITCHEN_YAML=.kitchen.travis.yml
+  - rvm: 2.4.2
+    services: docker
+    sudo: required
+    gemfile: kitchen-tests/Gemfile
+    before_install:
+      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
+    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
+    before_script:
+      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+      - cd kitchen-tests
+    script:
       - bundle exec kitchen test base-ubuntu-1404
     after_failure:
       - cat .kitchen/logs/kitchen.log
@@ -235,24 +253,6 @@ matrix:
     env:
      - FEDORA=latest
      - KITCHEN_YAML=.kitchen.travis.yml
-# - rvm: 2.4.2
-#   services: docker
-#   sudo: required
-#   gemfile: kitchen-tests/Gemfile
-#   before_install:
-#     - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-#     - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-#   bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-#   before_script:
-#     - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-#     - cd kitchen-tests
-#   script:
-#     - travis_wait bundle exec kitchen test base-amazonlinux
-#   after_failure:
-#     - cat .kitchen/logs/kitchen.log
-#   env:
-#     - AMAZONLINUX=LATEST
-#     - KITCHEN_YAML=.kitchen.travis.yml
 #  - rvm: 2.4.2
 #    services: docker
 #    sudo: required
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 7c00fdaeed..b8b4e4737b 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -29,6 +29,14 @@ verifier:
   format: progress
 
 platforms:
+- name: amazonlinux
+  driver:
+    image: dokken/amazonlinux
+    pid_one_command: /sbin/init
+    intermediate_instructions:
+      - RUN yum -y install sudo
+      - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
+
 - name: debian-7
   driver:
     image: dokken/debian-7
@@ -57,7 +65,7 @@ platforms:
 - name: centos-6
   driver:
     image: dokken/centos-6
-    run_command: /sbin/init
+    pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN yum -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
@@ -99,14 +107,6 @@ platforms:
     image: dokken/opensuse-leap
     pid_one_command: /bin/systemd
 
-- name: amazonlinux
-  driver:
-    image: dokken/amazonlinux
-    pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN yum -y install sudo
-      - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
-
 suites:
   - name: base
     run_list:
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index bb9791de90..080cad85a9 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -21,10 +21,17 @@ provisioner:
     diff_disabled: true
 
 platforms:
+  - name: amazonlinux
+    driver_config:
+      box: mvbcoding/awslinux
+  - name: centos-6
+  - name: centos-7
+  - name: debian-7
+  - name: debian-8
+  - name: debian-9
+  - name: opensuse-leap-42
   - name: ubuntu-14.04
   - name: ubuntu-16.04
-  - name: centos-7
-  - name: centos-6
 
 suites:
   - name: base
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 98eaf17ca3..0f41f7bf5e 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -19,7 +19,7 @@ GRAPH
     sudo (>= 0.0.0)
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
-  build-essential (8.0.3)
+  build-essential (8.0.4)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
   chef-client (9.0.2)
@@ -38,15 +38,15 @@ GRAPH
   nscd (5.0.0)
   ntp (3.5.4)
   ohai (5.2.0)
-  openssh (2.6.0)
+  openssh (2.6.1)
     iptables (>= 1.0)
   resolver (2.0.1)
   selinux (2.1.0)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
-  sudo (3.5.3)
+  sudo (4.0.0)
   ubuntu (2.0.1)
     apt (>= 0.0.0)
-  users (5.2.1)
+  users (5.2.2)
   windows (3.4.0)
     ohai (>= 4.0.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 8881c6b839..3dfae20dd8 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -1,38 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.8.1)
-    aws-sdk (2.9.1)
-      aws-sdk-resources (= 2.9.1)
-    aws-sdk-core (2.9.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    aws-sdk (2.10.94)
+      aws-sdk-resources (= 2.10.94)
+    aws-sdk-core (2.10.94)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.1)
-      aws-sdk-core (= 2.9.1)
-    aws-sigv4 (1.0.0)
-    berkshelf (5.6.4)
-      addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 2.0.2, < 4.0)
+    aws-sdk-resources (2.10.94)
+      aws-sdk-core (= 2.10.94)
+    aws-sigv4 (1.0.2)
+    berkshelf (6.3.1)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      buff-shell_out (~> 1.0)
+      chef (>= 12.7.2)
       cleanroom (~> 1.0)
+      concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
       mixlib-archive (~> 0.4)
+      mixlib-shellout (~> 2.0)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
-      solve (> 2.0, < 4.0)
+      solve (~> 4.0)
       thor (~> 0.19, < 0.19.2)
-    berkshelf-api-client (3.0.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      ridley (>= 4.5, < 6.0)
-    blankslate (2.1.2.4)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -47,119 +41,220 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.19.36)
+    chef (12.21.26)
+      addressable
+      bundler (>= 1.10)
+      chef-config (= 12.21.26)
+      chef-zero (>= 4.8, < 13)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      iniparse (~> 1.4)
+      mixlib-archive (~> 0.4)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.7)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (>= 8.6.0.alpha.1, < 13)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
+    chef (12.21.26-universal-mingw32)
+      addressable
+      bundler (>= 1.10)
+      chef-config (= 12.21.26)
+      chef-zero (>= 4.8, < 13)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      iniparse (~> 1.4)
+      mixlib-archive (~> 0.4)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.7)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (>= 8.6.0.alpha.1, < 13)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
+      win32-api (~> 1.5.3)
+      win32-dir (~> 0.5.0)
+      win32-event (~> 0.6.1)
+      win32-eventlog (= 0.6.3)
+      win32-mmap (~> 0.4.1)
+      win32-mutex (~> 0.4.2)
+      win32-process (~> 0.8.2)
+      win32-service (~> 0.8.7)
+      windows-api (~> 0.4.4)
+      wmi-lite (~> 1.0)
+    chef-config (12.21.26)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
+    chef-zero (5.3.2)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
+      mixlib-log (~> 1.3)
+      rack (~> 2.0)
+      uuidtools (~> 2.1)
     cleanroom (1.0.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    docker-api (1.33.2)
-      excon (>= 0.38.0)
-      json
+    docker-api (1.34.0)
+      excon (>= 0.47.0)
+      multi_json
     erubis (2.7.0)
-    excon (0.55.0)
-    faraday (0.9.2)
+    excon (0.59.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     ffi (1.9.18-x86-mingw32)
+    ffi-win32-extensions (1.0.3)
+      ffi
+    ffi-yajl (2.3.1)
+      libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.5)
-    hitimes (1.2.4)
-    hitimes (1.2.4-x86-mingw32)
+    hashie (3.5.6)
+    highline (1.7.10)
+    hitimes (1.2.6)
+    hitimes (1.2.6-x86-mingw32)
+    htmlentities (4.3.4)
     httpclient (2.8.3)
-    inspec (1.18.0)
-      addressable (~> 2.5)
+    iniparse (1.4.4)
+    inspec (1.46.2)
+      addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
+      htmlentities
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
-      nokogiri (~> 1.6)
       parallel (~> 1.9)
+      parslet (~> 1.5)
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
-      sslshake (~> 1)
+      semverse
+      sslshake (~> 1.2)
       thor (~> 0.19)
-      toml (~> 0.1)
-      train (>= 0.22.0, < 1.0)
+      tomlrb (~> 1.2)
+      train (~> 0.29, >= 0.29.2)
+    ipaddress (0.8.3)
     jmespath (1.3.1)
-    json (2.0.3)
+    json (2.1.0)
     kitchen-appbundle-updater (0.2.0)
     kitchen-dokken (1.1.0)
       docker-api (~> 1.33)
       test-kitchen (~> 1.13)
-    kitchen-ec2 (1.3.2)
+    kitchen-ec2 (1.4.0)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.17.0)
+    kitchen-inspec (0.20.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.0.2)
+    kitchen-vagrant (1.2.1)
       test-kitchen (~> 1.4)
+    libyajl2 (1.2.0)
     little-plugger (1.1.4)
-    logging (2.2.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.8.2)
-    mini_portile (0.6.2)
+    method_source (0.9.0)
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
+    mixlib-authentication (1.4.2)
+    mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (2.1.12)
-      artifactory
+    mixlib-install (3.8.0)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-shellout (2.2.7-universal-mingw32)
+    mixlib-shellout (2.3.2)
+    mixlib-shellout (2.3.2-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    mixlib-versioning (1.1.0)
-    molinillo (0.5.7)
-    multi_json (1.12.1)
+    mixlib-versioning (1.2.2)
+    molinillo (0.6.4)
+    multi_json (1.12.2)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.2.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    nio4r (2.0.0)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.4-x86-mingw32)
-      mini_portile (~> 0.6.0)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
+    nio4r (2.1.0)
     nori (2.6.0)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.11.1)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    pry (0.10.4)
+    ohai (8.25.1)
+      chef-config (>= 12.5.0.alpha.1, < 14)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log (>= 1.7.1, < 2.0)
+      mixlib-shellout (~> 2.0)
+      plist (~> 3.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    parallel (1.12.0)
+    parslet (1.8.1)
+    plist (3.3.0)
+    proxifier (1.0.3)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rainbow (2.2.1)
-    rake (12.0.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
+    rack (2.0.3)
+    rainbow (2.2.2)
+      rake
+    rake (12.3.0)
     retryable (2.0.4)
-    ridley (5.1.0)
+    ridley (5.1.1)
       addressable
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
@@ -169,7 +264,7 @@ GEM
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
       erubis
-      faraday (~> 0.9.0)
+      faraday (~> 0.9)
       hashie (>= 2.0.2, < 4.0.0)
       httpclient (~> 2.7)
       json (>= 1.7.7)
@@ -177,48 +272,65 @@ GEM
       retryable (~> 2.0)
       semverse (~> 2.0)
       varia_model (~> 0.6)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubyntlm (0.6.1)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubyntlm (0.6.2)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    slop (3.6.0)
-    solve (3.1.0)
-      molinillo (>= 0.5)
+    serverspec (2.41.3)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.72)
+    sfl (2.3)
+    solve (4.0.0)
+      molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    sslshake (1.1.0)
-    test-kitchen (1.16.0)
-      mixlib-install (>= 1.2, < 3.0)
+    specinfra (2.72.1)
+      net-scp
+      net-ssh (>= 2.7, < 5.0)
+      net-telnet
+      sfl
+    sslshake (1.2.0)
+    syslog-logger (1.6.8)
+    systemu (2.6.5)
+    test-kitchen (1.19.2)
+      mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
       thor (~> 0.19, < 0.19.2)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.1.0)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    train (0.23.0)
+    tomlrb (1.2.6)
+    train (0.29.2)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -226,13 +338,32 @@ GEM
       net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
+    uuidtools (2.1.5)
     vagrant-wrapper (2.0.3)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
+    win32-api (1.5.3-universal-mingw32)
+    win32-dir (0.5.1)
+      ffi (>= 1.0.0)
+    win32-event (0.6.3)
+      win32-ipc (>= 0.6.0)
+    win32-eventlog (0.6.3)
+      ffi
+    win32-ipc (0.7.0)
+      ffi
+    win32-mmap (0.4.2)
+      ffi
+    win32-mutex (0.4.3)
+      win32-ipc (>= 0.6.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    winrm (2.1.3)
+    win32-service (0.8.10)
+      ffi
+      ffi-win32-extensions
+    windows-api (0.4.4)
+      win32-api (>= 1.4.5)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -241,7 +372,10 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.0.1)
+    winrm-elevated (1.1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.1.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -266,4 +400,4 @@ DEPENDENCIES
   vagrant-wrapper
 
 BUNDLED WITH
-   1.14.6
+   1.16.0